diff options
| author | dannye <33dannye@gmail.com> | 2021-06-06 12:08:56 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-06-06 12:08:56 -0500 |
| commit | 36ef80903a5cb821ddf4660276709144df67f8b6 (patch) | |
| tree | fb7c5a5274a2d3438382a6fe17bd385c69ac0a05 | |
| parent | ed78da2f67c7e4dd5c80af96468bb9d4b41a7c8b (diff) | |
Remove some redundant address comments
70 files changed, 164 insertions, 1546 deletions
diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md index 4669e29..a81931f 100644 --- a/STYLE_GUIDE.md +++ b/STYLE_GUIDE.md @@ -70,7 +70,6 @@ Another common case is functions that are declared in the home bank for accessib CopyCardNameAndLevel: ; 29f5 (0:29f5) farcall _CopyCardNameAndLevel ret -; 0x29fa ``` ## Data labels @@ -203,7 +202,6 @@ DuelHorizontalSeparatorTileData: ; 5199 (1:5199) db 9, 6, $33, $34, 0 db 9, 7, $35, $36, $37, $37, $37, $37, $37, $37, $37, $37, $37, 0 db $ff -; 0x51c0 ``` diff --git a/src/audio/music/boosterpack.asm b/src/audio/music/boosterpack.asm index e3951e2..29c3db2 100644 --- a/src/audio/music/boosterpack.asm +++ b/src/audio/music/boosterpack.asm @@ -111,4 +111,3 @@ Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) tie G_ 6 music_end -; 0xf7df8 diff --git a/src/audio/music/cardpop.asm b/src/audio/music/cardpop.asm index 2bc7fdb..04aceb5 100644 --- a/src/audio/music/cardpop.asm +++ b/src/audio/music/cardpop.asm @@ -296,4 +296,3 @@ Branch_f7196: bass 2 snare1 2 music_ret -; 0xf71a0 diff --git a/src/audio/music/challengehall.asm b/src/audio/music/challengehall.asm index 5b28ffe..65f0102 100644 --- a/src/audio/music/challengehall.asm +++ b/src/audio/music/challengehall.asm @@ -1084,4 +1084,3 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) snare1 3 rest 3 EndMainLoop -; 0xf9be5 diff --git a/src/audio/music/club1.asm b/src/audio/music/club1.asm index 3b75f45..679dea8 100644 --- a/src/audio/music/club1.asm +++ b/src/audio/music/club1.asm @@ -917,4 +917,3 @@ Branch_fa06f: snare3 2 EndLoop music_ret -; 0xfa077 diff --git a/src/audio/music/club2.asm b/src/audio/music/club2.asm index 786273a..6b1f7f7 100644 --- a/src/audio/music/club2.asm +++ b/src/audio/music/club2.asm @@ -347,4 +347,3 @@ Branch_fa1f3: B_ 2 cutoff 6 music_ret -; 0xfa210 diff --git a/src/audio/music/club3.asm b/src/audio/music/club3.asm index dd0671e..a048323 100644 --- a/src/audio/music/club3.asm +++ b/src/audio/music/club3.asm @@ -1099,4 +1099,3 @@ Branch_fa796: snare4 1 bass 1 music_ret -; 0xfa7a0 diff --git a/src/audio/music/credits.asm b/src/audio/music/credits.asm index b26e8c8..567a44a 100644 --- a/src/audio/music/credits.asm +++ b/src/audio/music/credits.asm @@ -2428,4 +2428,3 @@ Branch_fbeea: EndLoop snare1 13 music_ret -; 0xfbef7 diff --git a/src/audio/music/deckmachine.asm b/src/audio/music/deckmachine.asm index e2fe594..d28439a 100644 --- a/src/audio/music/deckmachine.asm +++ b/src/audio/music/deckmachine.asm @@ -255,4 +255,3 @@ Branch_f7031: bass 7 snare3 8 music_ret -; 0xf703a diff --git a/src/audio/music/dueltheme1.asm b/src/audio/music/dueltheme1.asm index dc7d665..8d432f4 100644 --- a/src/audio/music/dueltheme1.asm +++ b/src/audio/music/dueltheme1.asm @@ -1998,4 +1998,3 @@ Branch_f5d58: snare1 1 EndLoop music_ret -; 0xf5d68 diff --git a/src/audio/music/dueltheme2.asm b/src/audio/music/dueltheme2.asm index a4e9b5e..c8b1eab 100644 --- a/src/audio/music/dueltheme2.asm +++ b/src/audio/music/dueltheme2.asm @@ -1235,4 +1235,3 @@ Branch_f6396: snare1 1 EndLoop music_ret -; 0xf63a1 diff --git a/src/audio/music/dueltheme3.asm b/src/audio/music/dueltheme3.asm index 325a1e4..ce1cc2e 100644 --- a/src/audio/music/dueltheme3.asm +++ b/src/audio/music/dueltheme3.asm @@ -1525,4 +1525,3 @@ Branch_f6b9a: snare1 1 EndLoop music_ret -; 0xf6bb7 diff --git a/src/audio/music/hallofhonor.asm b/src/audio/music/hallofhonor.asm index f840761..595143b 100644 --- a/src/audio/music/hallofhonor.asm +++ b/src/audio/music/hallofhonor.asm @@ -395,4 +395,3 @@ Branch_fb1ec: G_ 1 rest 1 music_ret -; 0xfb1fe diff --git a/src/audio/music/imakuni.asm b/src/audio/music/imakuni.asm index 13e2350..f467939 100644 --- a/src/audio/music/imakuni.asm +++ b/src/audio/music/imakuni.asm @@ -536,4 +536,3 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) snare1 15 snare1 15 EndMainLoop -; 0xfafea diff --git a/src/audio/music/matchdraw.asm b/src/audio/music/matchdraw.asm index de3d41e..0502e9c 100644 --- a/src/audio/music/matchdraw.asm +++ b/src/audio/music/matchdraw.asm @@ -104,4 +104,3 @@ Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) inc_octave C_ 1 music_end -; 0xf7d60 diff --git a/src/audio/music/matchloss.asm b/src/audio/music/matchloss.asm index 1029270..df04f07 100644 --- a/src/audio/music/matchloss.asm +++ b/src/audio/music/matchloss.asm @@ -127,4 +127,3 @@ Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) cutoff 8 F_ 12 music_end -; 0xf7cdf diff --git a/src/audio/music/matchstart1.asm b/src/audio/music/matchstart1.asm index 365f914..7c17634 100644 --- a/src/audio/music/matchstart1.asm +++ b/src/audio/music/matchstart1.asm @@ -51,4 +51,3 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) inc_octave B_ 1 music_end -; 0xf7956 diff --git a/src/audio/music/matchstart2.asm b/src/audio/music/matchstart2.asm index feae659..201a4af 100644 --- a/src/audio/music/matchstart2.asm +++ b/src/audio/music/matchstart2.asm @@ -173,4 +173,3 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) C_ 1 E_ 1 music_end -; 0xf7a0f diff --git a/src/audio/music/matchstart3.asm b/src/audio/music/matchstart3.asm index be1c322..44b20b9 100644 --- a/src/audio/music/matchstart3.asm +++ b/src/audio/music/matchstart3.asm @@ -322,4 +322,3 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) C_ 1 dec_octave music_end -; 0xf7b61 diff --git a/src/audio/music/matchvictory.asm b/src/audio/music/matchvictory.asm index feda345..8692d42 100644 --- a/src/audio/music/matchvictory.asm +++ b/src/audio/music/matchvictory.asm @@ -147,4 +147,3 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) speed 8 A_ 12 music_end -; 0xf7c2e diff --git a/src/audio/music/medal.asm b/src/audio/music/medal.asm index 47cc456..c706d98 100644 --- a/src/audio/music/medal.asm +++ b/src/audio/music/medal.asm @@ -157,4 +157,3 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) speed 1 A_ 2 music_end -; 0xf7ec8 diff --git a/src/audio/music/overworld.asm b/src/audio/music/overworld.asm index a06be35..8f0b032 100644 --- a/src/audio/music/overworld.asm +++ b/src/audio/music/overworld.asm @@ -1470,4 +1470,3 @@ Branch_f790a: snare1 2 snare1 1 music_ret -; 0xf7919 diff --git a/src/audio/music/pausemenu.asm b/src/audio/music/pausemenu.asm index ec0fdd6..2563cd0 100644 --- a/src/audio/music/pausemenu.asm +++ b/src/audio/music/pausemenu.asm @@ -580,4 +580,3 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) EndLoop EndLoop EndMainLoop -; 0xf6ef1 diff --git a/src/audio/music/pcmainmenu.asm b/src/audio/music/pcmainmenu.asm index 35fe010..38c567e 100644 --- a/src/audio/music/pcmainmenu.asm +++ b/src/audio/music/pcmainmenu.asm @@ -374,4 +374,3 @@ Branch_f9248: bass 1 snare2 1 music_ret -; 0xf9251 diff --git a/src/audio/music/pokemondome.asm b/src/audio/music/pokemondome.asm index 77c7ca0..e1343dc 100644 --- a/src/audio/music/pokemondome.asm +++ b/src/audio/music/pokemondome.asm @@ -796,4 +796,3 @@ Music_PokemonDome_Ch4: ; f9629 (3e:5629) snare2 3 EndLoop EndMainLoop -; 0xf9646 diff --git a/src/audio/music/ronald.asm b/src/audio/music/ronald.asm index 36886d0..638fbff 100644 --- a/src/audio/music/ronald.asm +++ b/src/audio/music/ronald.asm @@ -1214,4 +1214,3 @@ Branch_fad4f: snare1 13 bass 6 music_ret -; 0xfad55 diff --git a/src/audio/music/titlescreen.asm b/src/audio/music/titlescreen.asm index 2730ca9..cd67602 100644 --- a/src/audio/music/titlescreen.asm +++ b/src/audio/music/titlescreen.asm @@ -545,4 +545,3 @@ Branch_f531e: snare2 4 snare2 3 music_ret -; 0xf532a diff --git a/src/data/anims1.asm b/src/data/anims1.asm index 0657cb6..db1f881 100644 --- a/src/data/anims1.asm +++ b/src/data/anims1.asm @@ -5,7 +5,6 @@ AnimData0:: ; a8e54 (2a:4e54) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa8e6b
AnimFrameTable0:: ; a8e6b (2a:4e6b)
dw .data_a8e7f
@@ -88,7 +87,6 @@ AnimFrameTable0:: ; a8e6b (2a:4e6b) db 8, 0, 19, (1 << OAM_X_FLIP)
db 0, 8, 16, (1 << OAM_X_FLIP)
db 8, 8, 18, (1 << OAM_X_FLIP)
-; 0xa8f29
AnimData4:: ; a8f29 (2a:4f29)
frame_table AnimFrameTable1
@@ -97,7 +95,6 @@ AnimData4:: ; a8f29 (2a:4f29) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa8f40
AnimFrameTable1:: ; a8f40 (2a:4f40)
dw .data_a8f54
@@ -180,20 +177,17 @@ AnimFrameTable1:: ; a8f40 (2a:4f40) db 8, 0, 19, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa8ffe
AnimData7:: ; a8ffe (2a:4ffe)
frame_table AnimFrameTable1
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa900d
AnimData8:: ; a900d (2a:500d)
frame_table AnimFrameTable2
frame_data 0, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9018
AnimFrameTable2:: ; a9018 (2a:5018)
dw .data_a9020
@@ -228,7 +222,6 @@ AnimFrameTable2:: ; a9018 (2a:5018) db 8, -16, 1, (1 << OAM_OBP_NUM)
db 0, -8, 0, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, -8, 1, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa9064
AnimData9:: ; a9064 (2a:5064)
frame_table AnimFrameTable2
@@ -237,13 +230,11 @@ AnimData9:: ; a9064 (2a:5064) frame_data 3, 16, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xa907b
AnimData10:: ; a907b (2a:507b)
frame_table AnimFrameTable3
frame_data 0, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9086
AnimFrameTable3:: ; a9086 (2a:5086)
dw .data_a908e
@@ -278,13 +269,11 @@ AnimFrameTable3:: ; a9086 (2a:5086) db 8, 0, 5, (1 << OAM_X_FLIP)
db 0, 8, 2, (1 << OAM_X_FLIP)
db 8, 8, 4, (1 << OAM_X_FLIP)
-; 0xa90d2
AnimData13:: ; a90d2 (2a:50d2)
frame_table AnimFrameTable3
frame_data 3, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa90dd
AnimData14:: ; a90dd (2a:50dd)
frame_table AnimFrameTable4
@@ -293,7 +282,6 @@ AnimData14:: ; a90dd (2a:50dd) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa90f4
AnimFrameTable4:: ; a90f4 (2a:50f4)
dw .data_a9108
@@ -376,14 +364,12 @@ AnimFrameTable4:: ; a90f4 (2a:50f4) db 8, 0, 19, (1 << OAM_X_FLIP)
db 0, 8, 16, (1 << OAM_X_FLIP)
db 8, 8, 18, (1 << OAM_X_FLIP)
-; 0xa91b2
AnimData15:: ; a91b2 (2a:51b2)
frame_table AnimFrameTable4
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91c1
AnimData16:: ; a91c1 (2a:51c1)
frame_table AnimFrameTable4
@@ -392,14 +378,12 @@ AnimData16:: ; a91c1 (2a:51c1) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91d8
AnimData17:: ; a91d8 (2a:51d8)
frame_table AnimFrameTable4
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91e7
AnimData18:: ; a91e7 (2a:51e7)
frame_table AnimFrameTable5
@@ -408,7 +392,6 @@ AnimData18:: ; a91e7 (2a:51e7) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91fe
AnimFrameTable5:: ; a91fe (2a:51fe)
dw .data_a9212
@@ -491,14 +474,12 @@ AnimFrameTable5:: ; a91fe (2a:51fe) db 8, 0, 19, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa92bc
AnimData19:: ; a92bc (2a:52bc)
frame_table AnimFrameTable5
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa92cb
AnimData20:: ; a92cb (2a:52cb)
frame_table AnimFrameTable5
@@ -507,14 +488,12 @@ AnimData20:: ; a92cb (2a:52cb) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa92e2
AnimData21:: ; a92e2 (2a:52e2)
frame_table AnimFrameTable5
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa92f1
AnimData22:: ; a92f1 (2a:52f1)
frame_table AnimFrameTable6
@@ -523,7 +502,6 @@ AnimData22:: ; a92f1 (2a:52f1) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9308
AnimFrameTable6:: ; a9308 (2a:5308)
dw .data_a931c
@@ -606,14 +584,12 @@ AnimFrameTable6:: ; a9308 (2a:5308) db 8, 0, 19, %010 | (1 << OAM_X_FLIP)
db 0, 8, 16, %010 | (1 << OAM_X_FLIP)
db 8, 8, 18, %010 | (1 << OAM_X_FLIP)
-; 0xa93c6
AnimData23:: ; a93c6 (2a:53c6)
frame_table AnimFrameTable6
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa93d5
AnimData24:: ; a93d5 (2a:53d5)
frame_table AnimFrameTable6
@@ -622,14 +598,12 @@ AnimData24:: ; a93d5 (2a:53d5) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa93ec
AnimData25:: ; a93ec (2a:53ec)
frame_table AnimFrameTable6
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa93fb
AnimData26:: ; a93fb (2a:53fb)
frame_table AnimFrameTable7
@@ -638,7 +612,6 @@ AnimData26:: ; a93fb (2a:53fb) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9412
AnimFrameTable7:: ; a9412 (2a:5412)
dw .data_a9426
@@ -721,14 +694,12 @@ AnimFrameTable7:: ; a9412 (2a:5412) db 8, 0, 19, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 8, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa94d0
AnimData27:: ; a94d0 (2a:54d0)
frame_table AnimFrameTable7
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa94df
AnimData28:: ; a94df (2a:54df)
frame_table AnimFrameTable7
@@ -737,14 +708,12 @@ AnimData28:: ; a94df (2a:54df) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa94f6
AnimData29:: ; a94f6 (2a:54f6)
frame_table AnimFrameTable7
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9505
AnimData30:: ; a9505 (2a:5505)
frame_table AnimFrameTable8
@@ -753,7 +722,6 @@ AnimData30:: ; a9505 (2a:5505) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa951c
AnimFrameTable8:: ; a951c (2a:551c)
dw .data_a9530
@@ -836,14 +804,12 @@ AnimFrameTable8:: ; a951c (2a:551c) db 8, 0, 19, %100 | (1 << OAM_X_FLIP)
db 0, 8, 16, %100 | (1 << OAM_X_FLIP)
db 8, 8, 18, %100 | (1 << OAM_X_FLIP)
-; 0xa95da
AnimData31:: ; a95da (2a:55da)
frame_table AnimFrameTable8
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa95e9
AnimData32:: ; a95e9 (2a:55e9)
frame_table AnimFrameTable8
@@ -852,14 +818,12 @@ AnimData32:: ; a95e9 (2a:55e9) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9600
AnimData33:: ; a9600 (2a:5600)
frame_table AnimFrameTable8
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa960f
AnimData34:: ; a960f (2a:560f)
frame_table AnimFrameTable9
@@ -868,7 +832,6 @@ AnimData34:: ; a960f (2a:560f) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9626
AnimFrameTable9:: ; a9626 (2a:5626)
dw .data_a963a
@@ -951,14 +914,12 @@ AnimFrameTable9:: ; a9626 (2a:5626) db 8, 0, 19, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa96e4
AnimData35:: ; a96e4 (2a:56e4)
frame_table AnimFrameTable9
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa96f3
AnimData36:: ; a96f3 (2a:56f3)
frame_table AnimFrameTable9
@@ -967,14 +928,12 @@ AnimData36:: ; a96f3 (2a:56f3) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa970a
AnimData37:: ; a970a (2a:570a)
frame_table AnimFrameTable9
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9719
AnimData38:: ; a9719 (2a:5719)
frame_table AnimFrameTable10
@@ -983,7 +942,6 @@ AnimData38:: ; a9719 (2a:5719) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9730
AnimFrameTable10:: ; a9730 (2a:5730)
dw .data_a9744
@@ -1066,14 +1024,12 @@ AnimFrameTable10:: ; a9730 (2a:5730) db 8, 0, 19, %110 | (1 << OAM_X_FLIP)
db 0, 8, 16, %110 | (1 << OAM_X_FLIP)
db 8, 8, 18, %110 | (1 << OAM_X_FLIP)
-; 0xa97ee
AnimData39:: ; a97ee (2a:57ee)
frame_table AnimFrameTable10
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa97fd
AnimData40:: ; a97fd (2a:57fd)
frame_table AnimFrameTable10
@@ -1082,14 +1038,12 @@ AnimData40:: ; a97fd (2a:57fd) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9814
AnimData41:: ; a9814 (2a:5814)
frame_table AnimFrameTable10
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9823
AnimData42:: ; a9823 (2a:5823)
frame_table AnimFrameTable11
@@ -1098,7 +1052,6 @@ AnimData42:: ; a9823 (2a:5823) frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa983a
AnimFrameTable11:: ; a983a (2a:583a)
dw .data_a984e
@@ -1181,14 +1134,12 @@ AnimFrameTable11:: ; a983a (2a:583a) db 8, 0, 19, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa98f8
AnimData43:: ; a98f8 (2a:58f8)
frame_table AnimFrameTable11
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9907
AnimData44:: ; a9907 (2a:5907)
frame_table AnimFrameTable11
@@ -1197,20 +1148,17 @@ AnimData44:: ; a9907 (2a:5907) frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa991e
AnimData45:: ; a991e (2a:591e)
frame_table AnimFrameTable11
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa992d
AnimData46:: ; a992d (2a:592d)
frame_table AnimFrameTable12
frame_data 0, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9938
AnimFrameTable12:: ; a9938 (2a:5938)
dw .data_a9940
@@ -1245,7 +1193,6 @@ AnimFrameTable12:: ; a9938 (2a:5938) db 8, -16, 1, $0
db 0, -8, 0, (1 << OAM_X_FLIP)
db 8, -8, 1, (1 << OAM_X_FLIP)
-; 0xa9984
AnimData47:: ; a9984 (2a:5984)
frame_table AnimFrameTable12
@@ -1254,13 +1201,11 @@ AnimData47:: ; a9984 (2a:5984) frame_data 3, 16, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xa999b
AnimData48:: ; a999b (2a:599b)
frame_table AnimFrameTable13
frame_data 0, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa99a6
AnimFrameTable13:: ; a99a6 (2a:59a6)
dw .data_a99ae
@@ -1295,25 +1240,21 @@ AnimFrameTable13:: ; a99a6 (2a:59a6) db 8, 0, 5, (1 << OAM_X_FLIP)
db 0, 8, 2, (1 << OAM_X_FLIP)
db 8, 8, 4, (1 << OAM_X_FLIP)
-; 0xa99f2
AnimData49:: ; a99f2 (2a:59f2)
frame_table AnimFrameTable13
frame_data 1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa99fd
AnimData50:: ; a99fd (2a:59fd)
frame_table AnimFrameTable13
frame_data 2, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a08
AnimData51:: ; a9a08 (2a:5a08)
frame_table AnimFrameTable13
frame_data 3, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a13
AnimData52:: ; a9a13 (2a:5a13)
frame_table AnimFrameTable14
@@ -1321,7 +1262,6 @@ AnimData52:: ; a9a13 (2a:5a13) frame_data 1, 13, 0, 0
frame_data 2, 13, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a26
AnimFrameTable14:: ; a9a26 (2a:5a26)
dw .data_a9a30
@@ -1359,21 +1299,18 @@ AnimFrameTable14:: ; a9a26 (2a:5a26) db 8, 0, 7, $0
db 0, 8, 6, (1 << OAM_X_FLIP)
db 8, 8, 7, (1 << OAM_X_FLIP)
-; 0xa9a71
AnimData53:: ; a9a71 (2a:5a71)
frame_table AnimFrameTable14
frame_data 4, 5, 0, 0
frame_data 3, 10, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a80
AnimData54:: ; a9a80 (2a:5a80)
frame_table AnimFrameTable14
frame_data 4, 4, 0, 0
frame_data 3, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a8f
AnimData55:: ; a9a8f (2a:5a8f)
frame_table AnimFrameTable15
@@ -1381,7 +1318,6 @@ AnimData55:: ; a9a8f (2a:5a8f) frame_data 1, 13, 0, 0
frame_data 2, 13, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9aa2
AnimFrameTable15:: ; a9aa2 (2a:5aa2)
dw .data_a9aac
@@ -1419,21 +1355,18 @@ AnimFrameTable15:: ; a9aa2 (2a:5aa2) db 8, 0, 7, %100
db 0, 8, 6, %100 | (1 << OAM_X_FLIP)
db 8, 8, 7, %100 | (1 << OAM_X_FLIP)
-; 0xa9aed
AnimData56:: ; a9aed (2a:5aed)
frame_table AnimFrameTable15
frame_data 4, 5, 0, 0
frame_data 3, 10, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9afc
AnimData57:: ; a9afc (2a:5afc)
frame_table AnimFrameTable15
frame_data 4, 4, 0, 0
frame_data 3, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9b0b
AnimData58:: ; a9b0b (2a:5b0b)
frame_table AnimFrameTable16
@@ -1442,7 +1375,6 @@ AnimData58:: ; a9b0b (2a:5b0b) frame_data 2, 6, 0, 0
frame_data 3, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9b22
AnimFrameTable16:: ; a9b22 (2a:5b22)
dw .data_a9b2a
@@ -1477,7 +1409,6 @@ AnimFrameTable16:: ; a9b22 (2a:5b22) db 0, 0, 5, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 6, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 0, 7, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa9b6e
AnimData59:: ; a9b6e (2a:5b6e)
frame_table AnimFrameTable17
@@ -1502,7 +1433,6 @@ AnimData59:: ; a9b6e (2a:5b6e) frame_data 4, 2, 0, 0
frame_data 5, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9bc5
AnimFrameTable17:: ; a9bc5 (2a:5bc5)
dw .data_a9bf9
@@ -1673,7 +1603,6 @@ AnimFrameTable17:: ; a9bc5 (2a:5bc5) db 2 ; size
db 0, 0, 5, (1 << OAM_X_FLIP)
db 8, 0, 6, (1 << OAM_X_FLIP)
-; 0xa9d13
AnimData60:: ; a9d13 (2a:5d13)
frame_table AnimFrameTable17
@@ -1698,7 +1627,6 @@ AnimData60:: ; a9d13 (2a:5d13) frame_data 10, 2, 0, 0
frame_data 11, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9d6a
AnimData61:: ; a9d6a (2a:5d6a)
frame_table AnimFrameTable17
@@ -1723,7 +1651,6 @@ AnimData61:: ; a9d6a (2a:5d6a) frame_data 12, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9dc1
AnimData62:: ; a9dc1 (2a:5dc1)
frame_table AnimFrameTable17
@@ -1748,7 +1675,6 @@ AnimData62:: ; a9dc1 (2a:5dc1) frame_data 17, 2, 0, 0
frame_data 18, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9e18
AnimData63:: ; a9e18 (2a:5e18)
frame_table AnimFrameTable17
@@ -1773,7 +1699,6 @@ AnimData63:: ; a9e18 (2a:5e18) frame_data 23, 2, 0, 0
frame_data 24, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9e6f
AnimData64:: ; a9e6f (2a:5e6f)
frame_table AnimFrameTable17
@@ -1798,7 +1723,6 @@ AnimData64:: ; a9e6f (2a:5e6f) frame_data 25, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9ec6
AnimData65:: ; a9ec6 (2a:5ec6)
frame_table AnimFrameTable18
@@ -1823,7 +1747,6 @@ AnimData65:: ; a9ec6 (2a:5ec6) frame_data 4, 2, 0, 0
frame_data 5, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9f1d
AnimFrameTable18:: ; a9f1d (2a:5f1d)
dw .data_a9f51
@@ -1994,7 +1917,6 @@ AnimFrameTable18:: ; a9f1d (2a:5f1d) db 2 ; size
db 0, 0, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 0, 6, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xaa06b
AnimData66:: ; aa06b (2a:606b)
frame_table AnimFrameTable18
@@ -2019,7 +1941,6 @@ AnimData66:: ; aa06b (2a:606b) frame_data 10, 2, 0, 0
frame_data 11, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa0c2
AnimData67:: ; aa0c2 (2a:60c2)
frame_table AnimFrameTable18
@@ -2044,7 +1965,6 @@ AnimData67:: ; aa0c2 (2a:60c2) frame_data 12, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa119
AnimData68:: ; aa119 (2a:6119)
frame_table AnimFrameTable18
@@ -2069,7 +1989,6 @@ AnimData68:: ; aa119 (2a:6119) frame_data 17, 2, 0, 0
frame_data 18, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa170
AnimData69:: ; aa170 (2a:6170)
frame_table AnimFrameTable18
@@ -2094,7 +2013,6 @@ AnimData69:: ; aa170 (2a:6170) frame_data 23, 2, 0, 0
frame_data 24, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa1c7
AnimData70:: ; aa1c7 (2a:61c7)
frame_table AnimFrameTable18
@@ -2119,7 +2037,6 @@ AnimData70:: ; aa1c7 (2a:61c7) frame_data 25, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa21e
AnimData71:: ; aa21e (2a:621e)
frame_table AnimFrameTable19
@@ -2134,7 +2051,6 @@ AnimData71:: ; aa21e (2a:621e) frame_data 2, 4, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa24d
AnimFrameTable19:: ; aa24d (2a:624d)
dw .data_aa253
@@ -2193,7 +2109,6 @@ AnimFrameTable19:: ; aa24d (2a:624d) db 8, -8, 1, (1 << OAM_Y_FLIP)
db 0, -16, 2, (1 << OAM_Y_FLIP)
db 0, -8, 3, (1 << OAM_Y_FLIP)
-; 0xaa306
AnimData72:: ; aa306 (2a:6306)
frame_table AnimFrameTable20
@@ -2203,7 +2118,6 @@ AnimData72:: ; aa306 (2a:6306) frame_data 1, 8, 0, 0
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa321
AnimFrameTable20:: ; aa321 (2a:6321)
dw .data_aa325
@@ -2262,7 +2176,6 @@ AnimFrameTable20:: ; aa321 (2a:6321) db 0, 24, 5, (1 << OAM_Y_FLIP)
db -8, 24, 4, (1 << OAM_Y_FLIP)
db -16, 24, 5, (1 << OAM_Y_FLIP)
-; 0xaa3e7
AnimData73:: ; aa3e7 (2a:63e7)
frame_table AnimFrameTable21
@@ -2279,7 +2192,6 @@ AnimData73:: ; aa3e7 (2a:63e7) frame_data 4, 7, 0, 0
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa41e
AnimFrameTable21:: ; aa41e (2a:641e)
dw .data_aa428
@@ -2344,7 +2256,6 @@ AnimFrameTable21:: ; aa41e (2a:641e) db -5, 0, 1, (1 << OAM_X_FLIP)
db 3, 0, 5, (1 << OAM_X_FLIP)
db -18, 15, 7, $0
-; 0xaa4d5
AnimData74:: ; aa4d5 (2a:64d5)
frame_table AnimFrameTable22
@@ -2358,7 +2269,6 @@ AnimData74:: ; aa4d5 (2a:64d5) frame_data 7, 8, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa500
AnimFrameTable22:: ; aa500 (2a:6500)
dw .data_aa510
@@ -2457,7 +2367,6 @@ AnimFrameTable22:: ; aa500 (2a:6500) db -24, -16, 1, (1 << OAM_X_FLIP)
db 8, 8, 1, $0
db 8, 16, 1, (1 << OAM_X_FLIP)
-; 0xaa618
AnimData75:: ; aa618 (2a:6618)
frame_table AnimFrameTable23
@@ -2467,7 +2376,6 @@ AnimData75:: ; aa618 (2a:6618) frame_data 3, 32, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa633
AnimFrameTable23:: ; aa633 (2a:6633)
dw .data_aa63b
@@ -2538,7 +2446,6 @@ AnimFrameTable23:: ; aa633 (2a:6633) db -8, -16, 1, (1 << OAM_X_FLIP)
db 0, 8, 1, $0
db -8, 0, 3, $0
-; 0xaa70f
AnimData76:: ; aa70f (2a:670f)
frame_table AnimFrameTable24
@@ -2549,7 +2456,6 @@ AnimData76:: ; aa70f (2a:670f) frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa72e
AnimFrameTable24:: ; aa72e (2a:672e)
dw .data_aa73c
@@ -2666,7 +2572,6 @@ AnimFrameTable24:: ; aa72e (2a:672e) db -9, -33, 8, (1 << OAM_X_FLIP)
db 17, -7, 8, (1 << OAM_Y_FLIP)
db 17, -33, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xaa89b
AnimData77:: ; aa89b (2a:689b)
frame_table AnimFrameTable24
@@ -2677,7 +2582,6 @@ AnimData77:: ; aa89b (2a:689b) frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa8ba
AnimData78:: ; aa8ba (2a:68ba)
frame_table AnimFrameTable24
@@ -2690,7 +2594,6 @@ AnimData78:: ; aa8ba (2a:68ba) frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa8e1
AnimData79:: ; aa8e1 (2a:68e1)
frame_table AnimFrameTable25
@@ -2727,7 +2630,6 @@ AnimData79:: ; aa8e1 (2a:68e1) frame_data 0, 1, 0, -1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa968
AnimFrameTable25:: ; aa968 (2a:6968)
dw .data_aa982
@@ -2800,7 +2702,6 @@ AnimFrameTable25:: ; aa968 (2a:6968) .data_aa9d2
db 1 ; size
db 0, 0, 10, $0
-; 0xaa9d7
AnimData80:: ; aa9d7 (2a:69d7)
frame_table AnimFrameTable25
@@ -2837,7 +2738,6 @@ AnimData80:: ; aa9d7 (2a:69d7) frame_data 1, 1, 0, -1
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaaa5e
AnimData81:: ; aaa5e (2a:6a5e)
frame_table AnimFrameTable25
@@ -2874,7 +2774,6 @@ AnimData81:: ; aaa5e (2a:6a5e) frame_data 2, 1, 0, -1
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaaae5
AnimData82:: ; aaae5 (2a:6ae5)
frame_table AnimFrameTable25
@@ -2911,7 +2810,6 @@ AnimData82:: ; aaae5 (2a:6ae5) frame_data 3, 1, 0, -1
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaab6c
AnimData83:: ; aab6c (2a:6b6c)
frame_table AnimFrameTable25
@@ -2948,7 +2846,6 @@ AnimData83:: ; aab6c (2a:6b6c) frame_data 4, 1, 0, -1
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaabf3
AnimData84:: ; aabf3 (2a:6bf3)
frame_table AnimFrameTable25
@@ -2985,7 +2882,6 @@ AnimData84:: ; aabf3 (2a:6bf3) frame_data 5, 1, 0, -1
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaac7a
AnimData85:: ; aac7a (2a:6c7a)
frame_table AnimFrameTable25
@@ -3022,7 +2918,6 @@ AnimData85:: ; aac7a (2a:6c7a) frame_data 6, 1, 0, -1
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaad01
AnimData86:: ; aad01 (2a:6d01)
frame_table AnimFrameTable25
@@ -3059,7 +2954,6 @@ AnimData86:: ; aad01 (2a:6d01) frame_data 7, 1, 0, -1
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaad88
AnimData87:: ; aad88 (2a:6d88)
frame_table AnimFrameTable25
@@ -3096,7 +2990,6 @@ AnimData87:: ; aad88 (2a:6d88) frame_data 8, 1, 0, -1
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaae0f
AnimData88:: ; aae0f (2a:6e0f)
frame_table AnimFrameTable25
@@ -3133,7 +3026,6 @@ AnimData88:: ; aae0f (2a:6e0f) frame_data 9, 1, 0, -1
frame_data 9, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaae96
AnimData89:: ; aae96 (2a:6e96)
frame_table AnimFrameTable25
@@ -3170,7 +3062,6 @@ AnimData89:: ; aae96 (2a:6e96) frame_data 10, 1, 0, -1
frame_data 10, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaaf1d
AnimData90:: ; aaf1d (2a:6f1d)
frame_table AnimFrameTable25
@@ -3207,7 +3098,6 @@ AnimData90:: ; aaf1d (2a:6f1d) frame_data 11, 1, 0, -1
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaafa4
AnimData91:: ; aafa4 (2a:6fa4)
frame_table AnimFrameTable25
@@ -3244,7 +3134,6 @@ AnimData91:: ; aafa4 (2a:6fa4) frame_data 12, 1, 0, -1
frame_data 12, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab02b
AnimData92:: ; ab02b (2a:702b)
frame_table AnimFrameTable26
@@ -3262,7 +3151,6 @@ AnimData92:: ; ab02b (2a:702b) frame_data 6, 2, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab066
AnimFrameTable26:: ; ab066 (2a:7066)
dw .data_ab074
@@ -3325,13 +3213,11 @@ AnimFrameTable26:: ; ab066 (2a:7066) db 14, -26, 8, (1 << OAM_X_FLIP)
db 14, 18, 7, (1 << OAM_X_FLIP)
db -22, -26, 7, (1 << OAM_X_FLIP)
-; 0xab0fb
AnimData93:: ; ab0fb (2a:70fb)
frame_table AnimFrameTable26
frame_data 8, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xab106
AnimData94:: ; ab106 (2a:7106)
frame_table AnimFrameTable27
@@ -3349,7 +3235,6 @@ AnimData94:: ; ab106 (2a:7106) frame_data -1, 2, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab141
AnimFrameTable27:: ; ab141 (2a:7141)
dw .data_ab14d
@@ -3466,7 +3351,6 @@ AnimFrameTable27:: ; ab141 (2a:7141) db -16, -8, 8, (1 << OAM_X_FLIP)
db -8, 0, 11, (1 << OAM_X_FLIP)
db -8, -8, 12, (1 << OAM_X_FLIP)
-; 0xab2bb
AnimData95:: ; ab2bb (2a:72bb)
frame_table AnimFrameTable28
@@ -3481,7 +3365,6 @@ AnimData95:: ; ab2bb (2a:72bb) frame_data 8, 2, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab2ea
AnimFrameTable28:: ; ab2ea (2a:72ea)
dw .data_ab2fc
@@ -3584,7 +3467,6 @@ AnimFrameTable28:: ; ab2ea (2a:72ea) db 20, -28, 2, (1 << OAM_X_FLIP)
db 5, -36, 0, (1 << OAM_X_FLIP)
db -12, 27, 0, (1 << OAM_X_FLIP)
-; 0xab405
AnimData96:: ; ab405 (2a:7405)
frame_table AnimFrameTable29
@@ -3602,7 +3484,6 @@ AnimData96:: ; ab405 (2a:7405) frame_data -1, 2, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab440
AnimFrameTable29:: ; ab440 (2a:7440)
dw .data_ab44c
@@ -3764,7 +3645,6 @@ AnimFrameTable29:: ; ab440 (2a:7440) db -56, 18, 44, $0
db -56, 2, 44, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -56, 10, 42, $0
-; 0xab66e
AnimData97:: ; ab66e (2a:766e)
frame_table AnimFrameTable30
@@ -3783,7 +3663,6 @@ AnimData97:: ; ab66e (2a:766e) frame_data 8, 4, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab6ad
AnimFrameTable30:: ; ab6ad (2a:76ad)
dw .data_ab6d5
@@ -4048,7 +3927,6 @@ AnimFrameTable30:: ; ab6ad (2a:76ad) db -16, 12, 12, $0
db 8, 12, 12, $0
db 8, -20, 12, $0
-; 0xab9c1
AnimData98:: ; ab9c1 (2a:79c1)
frame_table AnimFrameTable30
@@ -4070,7 +3948,6 @@ AnimData98:: ; ab9c1 (2a:79c1) frame_data 19, 5, 0, 0
frame_data 19, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaba0c
AnimData99:: ; aba0c (2a:7a0c)
frame_table AnimFrameTable31
@@ -4116,7 +3993,6 @@ AnimData99:: ; aba0c (2a:7a0c) frame_data 3, 2, 80, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabab7
AnimFrameTable31:: ; abab7 (2a:7ab7)
dw .data_abac7
@@ -4215,7 +4091,6 @@ AnimFrameTable31:: ; abab7 (2a:7ab7) db -39, 32, 12, $0
db -39, 24, 11, $0
db -47, 24, 8, $0
-; 0xabbcf
AnimData101:: ; abbcf (2a:7bcf)
frame_table AnimFrameTable32
@@ -4230,7 +4105,6 @@ AnimData101:: ; abbcf (2a:7bcf) frame_data 2, 8, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabbfe
AnimData102:: ; abbfe (2a:7bfe)
frame_table AnimFrameTable32
@@ -4238,7 +4112,6 @@ AnimData102:: ; abbfe (2a:7bfe) frame_data -1, 8, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabc11
AnimData103:: ; abc11 (2a:7c11)
frame_table AnimFrameTable32
@@ -4267,7 +4140,6 @@ AnimData103:: ; abc11 (2a:7c11) frame_data 9, 8, 0, 0
frame_data 9, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabc78
AnimData104:: ; abc78 (2a:7c78)
frame_table AnimFrameTable32
@@ -4299,7 +4171,6 @@ AnimData104:: ; abc78 (2a:7c78) frame_data 2, 8, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabceb
AnimData105:: ; abceb (2a:7ceb)
frame_table AnimFrameTable33
@@ -4322,7 +4193,6 @@ AnimData105:: ; abceb (2a:7ceb) frame_data -1, 4, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabd3a
AnimFrameTable33:: ; abd3a (2a:7d3a)
dw .data_abd4a
@@ -4442,7 +4312,6 @@ AnimFrameTable33:: ; abd3a (2a:7d3a) db -56, 0, 0, (1 << OAM_Y_FLIP)
db -80, -32, 0, $0
db -72, -32, 0, (1 << OAM_Y_FLIP)
-; 0xabea6
AnimData106:: ; abea6 (2a:7ea6)
frame_table AnimFrameTable34
@@ -4466,7 +4335,6 @@ AnimData106:: ; abea6 (2a:7ea6) frame_data 8, 4, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabef9
AnimFrameTable34:: ; abef9 (2a:7ef9)
dw .data_abf0b
@@ -4559,7 +4427,6 @@ AnimFrameTable34:: ; abef9 (2a:7ef9) db -19, 0, 24, (1 << OAM_X_FLIP)
db -11, 0, 25, (1 << OAM_X_FLIP)
db -3, 0, 26, (1 << OAM_X_FLIP)
-; 0xabfec
AnimData149:: ; abfec (2a:7fec)
frame_table AnimFrameTable71
@@ -4567,4 +4434,3 @@ AnimData149:: ; abfec (2a:7fec) frame_data 1, 8, 0, 0
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabfff
diff --git a/src/data/anims2.asm b/src/data/anims2.asm index 2cc78de..42969d1 100644 --- a/src/data/anims2.asm +++ b/src/data/anims2.asm @@ -29,7 +29,6 @@ AnimData100:: ; ac000 (2b:4000) frame_data 2, 5, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xac077
AnimFrameTable32:: ; ac077 (2b:4077)
dw .data_ac0a7
@@ -593,7 +592,6 @@ AnimFrameTable32:: ; ac077 (2b:4077) db 8, -8, 31, $0
db 0, -8, 28, $0
db 0, 0, 29, $0
-; 0xac803
AnimData107:: ; ac803 (2b:4803)
frame_table AnimFrameTable35
@@ -617,7 +615,6 @@ AnimData107:: ; ac803 (2b:4803) frame_data 11, 5, 0, 0
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xac856
AnimFrameTable35:: ; ac856 (2b:4856)
dw .data_ac86e
@@ -771,7 +768,6 @@ AnimFrameTable35:: ; ac856 (2b:4856) db 2 ; size
db -8, 16, 6, $0
db 0, -8, 6, $0
-; 0xaca16
AnimData108:: ; aca16 (2b:4a16)
frame_table AnimFrameTable36
@@ -786,7 +782,6 @@ AnimData108:: ; aca16 (2b:4a16) frame_data 8, 6, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaca45
AnimFrameTable36:: ; aca45 (2b:4a45)
dw .data_aca57
@@ -884,7 +879,6 @@ AnimFrameTable36:: ; aca45 (2b:4a45) db 8, -12, 11, (1 << OAM_X_FLIP)
db 0, 12, 11, (1 << OAM_X_FLIP)
db 0, -4, 11, (1 << OAM_X_FLIP)
-; 0xacb4c
AnimData109:: ; acb4c (2b:4b4c)
frame_table AnimFrameTable37
@@ -919,7 +913,6 @@ AnimData109:: ; acb4c (2b:4b4c) frame_data 8, 3, 16, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xacbcb
AnimFrameTable37:: ; acbcb (2b:4bcb)
dw .data_acbdd
@@ -1266,7 +1259,6 @@ AnimFrameTable37:: ; acbcb (2b:4bcb) db 18, 72, 0, $0
db -8, -8, 0, $0
db -48, -32, 0, $0
-; 0xad0b6
AnimData110:: ; ad0b6 (2b:50b6)
frame_table AnimFrameTable38
@@ -1306,7 +1298,6 @@ AnimData110:: ; ad0b6 (2b:50b6) frame_data 16, 7, 0, 0
frame_data 16, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad149
AnimFrameTable38:: ; ad149 (2b:5149)
dw .data_ad16b
@@ -1499,7 +1490,6 @@ AnimFrameTable38:: ; ad149 (2b:5149) db -8, 0, 33, (1 << OAM_X_FLIP)
db 0, 0, 33, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 0, -8, 33, (1 << OAM_Y_FLIP)
-; 0xad364
AnimData111:: ; ad364 (2b:5364)
frame_table AnimFrameTable39
@@ -1511,7 +1501,6 @@ AnimData111:: ; ad364 (2b:5364) frame_data 5, 16, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad387
AnimFrameTable39:: ; ad387 (2b:5387)
dw .data_ad393
@@ -1612,7 +1601,6 @@ AnimFrameTable39:: ; ad387 (2b:5387) db 4, -16, 30, (1 << OAM_X_FLIP)
db 4, -24, 31, (1 << OAM_X_FLIP)
db -12, -16, 18, (1 << OAM_Y_FLIP)
-; 0xad4c1
AnimData112:: ; ad4c1 (2b:54c1)
frame_table AnimFrameTable40
@@ -1631,7 +1619,6 @@ AnimData112:: ; ad4c1 (2b:54c1) frame_data 10, 2, 0, 0
frame_data 10, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad500
AnimFrameTable40:: ; ad500 (2b:5500)
dw .data_ad516
@@ -1872,7 +1859,6 @@ AnimFrameTable40:: ; ad500 (2b:5500) db -64, -16, 7, (1 << OAM_Y_FLIP)
db 0, -16, 8, (1 << OAM_Y_FLIP)
db 0, -8, 9, (1 << OAM_Y_FLIP)
-; 0xad829
AnimData113:: ; ad829 (2b:5829)
frame_table AnimFrameTable41
@@ -1894,7 +1880,6 @@ AnimData113:: ; ad829 (2b:5829) frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad874
AnimFrameTable41:: ; ad874 (2b:5874)
dw .data_ad88e
@@ -2097,7 +2082,6 @@ AnimFrameTable41:: ; ad874 (2b:5874) db -12, 0, 24, (1 << OAM_X_FLIP)
db -12, -8, 25, (1 << OAM_X_FLIP)
db -12, -16, 26, (1 << OAM_X_FLIP)
-; 0xadaeb
AnimData114:: ; adaeb (2b:5aeb)
frame_table AnimFrameTable42
@@ -2110,7 +2094,6 @@ AnimData114:: ; adaeb (2b:5aeb) frame_data 0, 11, -24, 24
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xadb12
AnimFrameTable42:: ; adb12 (2b:5b12)
dw .data_adb2c
@@ -2328,7 +2311,6 @@ AnimFrameTable42:: ; adb12 (2b:5b12) db 16, -40, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 24, -32, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 24, -40, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xaddc5
AnimData115:: ; addc5 (2b:5dc5)
frame_table AnimFrameTable42
@@ -2349,7 +2331,6 @@ AnimData115:: ; addc5 (2b:5dc5) frame_data 12, 7, 0, 0
frame_data 12, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xade0c
AnimData116:: ; ade0c (2b:5e0c)
frame_table AnimFrameTable43
@@ -2369,7 +2350,6 @@ AnimData116:: ; ade0c (2b:5e0c) frame_data 1, 3, -8, -8
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xade4f
AnimFrameTable43:: ; ade4f (2b:5e4f)
dw .data_ade61
@@ -2505,7 +2485,6 @@ AnimFrameTable43:: ; ade4f (2b:5e4f) db 16, 3, 26, $0
db -18, -11, 26, (1 << OAM_X_FLIP)
db -8, 13, 26, (1 << OAM_X_FLIP)
-; 0xadfee
AnimData117:: ; adfee (2b:5fee)
frame_table AnimFrameTable43
@@ -2535,7 +2514,6 @@ AnimData117:: ; adfee (2b:5fee) frame_data 3, 3, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae059
AnimData118:: ; ae059 (2b:6059)
frame_table AnimFrameTable43
@@ -2569,7 +2547,6 @@ AnimData118:: ; ae059 (2b:6059) frame_data 8, 5, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae0d4
AnimData119:: ; ae0d4 (2b:60d4)
frame_table AnimFrameTable44
@@ -2593,7 +2570,6 @@ AnimData119:: ; ae0d4 (2b:60d4) frame_data -1, 2, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae127
AnimFrameTable44:: ; ae127 (2b:6127)
dw .data_ae13f
@@ -2736,7 +2712,6 @@ AnimFrameTable44:: ; ae127 (2b:6127) db -4, 72, 7, $0
db -4, 92, 7, $0
db -4, 112, 7, $0
-; 0xae2bb
AnimData120:: ; ae2bb (2b:62bb)
frame_table AnimFrameTable45
@@ -2750,7 +2725,6 @@ AnimData120:: ; ae2bb (2b:62bb) frame_data 4, 4, 0, 0
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae2e6
AnimFrameTable45:: ; ae2e6 (2b:62e6)
dw .data_ae306
@@ -2973,7 +2947,6 @@ AnimFrameTable45:: ; ae2e6 (2b:62e6) db -10, 10, 10, (1 << OAM_Y_FLIP)
db -2, 10, 11, (1 << OAM_Y_FLIP)
db -2, 18, 12, (1 << OAM_Y_FLIP)
-; 0xae586
AnimData121:: ; ae586 (2b:6586)
frame_table AnimFrameTable45
@@ -2997,7 +2970,6 @@ AnimData121:: ; ae586 (2b:6586) frame_data 15, 4, 0, 0
frame_data 15, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae5d9
AnimData122:: ; ae5d9 (2b:65d9)
frame_table AnimFrameTable46
@@ -3012,7 +2984,6 @@ AnimData122:: ; ae5d9 (2b:65d9) frame_data 8, 4, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae608
AnimFrameTable46:: ; ae608 (2b:6608)
dw .data_ae61a
@@ -3138,7 +3109,6 @@ AnimFrameTable46:: ; ae608 (2b:6608) db -8, -10, 31, $0
db -8, -2, 32, $0
db -8, 6, 33, $0
-; 0xae77f
AnimData123:: ; ae77f (2b:677f)
frame_table AnimFrameTable47
@@ -3167,7 +3137,6 @@ AnimData123:: ; ae77f (2b:677f) frame_data 22, 2, 0, 0
frame_data 22, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae7e6
AnimFrameTable47:: ; ae7e6 (2b:67e6)
dw .data_ae814
@@ -3626,7 +3595,6 @@ AnimFrameTable47:: ; ae7e6 (2b:67e6) db -23, 24, 11, $0
db 16, 16, 11, (1 << OAM_Y_FLIP)
db 15, 24, 11, (1 << OAM_Y_FLIP)
-; 0xaeddb
AnimData124:: ; aeddb (2b:6ddb)
frame_table AnimFrameTable48
@@ -3665,7 +3633,6 @@ AnimData124:: ; aeddb (2b:6ddb) frame_data 2, 2, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaee6a
AnimFrameTable48:: ; aee6a (2b:6e6a)
dw .data_aee76
@@ -3785,7 +3752,6 @@ AnimFrameTable48:: ; aee6a (2b:6e6a) db 0, -8, 35, (1 << OAM_X_FLIP)
db -1, -13, 36, $0
db -24, 4, 36, $0
-; 0xaeff0
AnimData125:: ; aeff0 (2b:6ff0)
frame_table AnimFrameTable49
@@ -3805,7 +3771,6 @@ AnimData125:: ; aeff0 (2b:6ff0) frame_data 3, 5, 10, -3
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf033
AnimFrameTable49:: ; af033 (2b:7033)
dw .data_af03b
@@ -3879,7 +3844,6 @@ AnimFrameTable49:: ; af033 (2b:7033) db 8, 8, 9, (1 << OAM_X_FLIP)
db 8, 0, 10, (1 << OAM_X_FLIP)
db 8, -8, 11, (1 << OAM_X_FLIP)
-; 0xaf11b
AnimData126:: ; af11b (2b:711b)
frame_table AnimFrameTable50
@@ -3934,7 +3898,6 @@ AnimData126:: ; af11b (2b:711b) frame_data 0, 2, -4, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf1ea
AnimFrameTable50:: ; af1ea (2b:71ea)
dw .data_af202
@@ -4059,7 +4022,6 @@ AnimFrameTable50:: ; af1ea (2b:71ea) db -55, -44, 4, $0
db -47, -44, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -47, -36, 5, $0
-; 0xaf336
AnimData127:: ; af336 (2b:7336)
frame_table AnimFrameTable51
@@ -4081,7 +4043,6 @@ AnimData127:: ; af336 (2b:7336) frame_data 7, 16, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf381
AnimFrameTable51:: ; af381 (2b:7381)
dw .data_af391
@@ -4408,7 +4369,6 @@ AnimFrameTable51:: ; af381 (2b:7381) db -8, -16, 73, $0
db -8, -8, 74, $0
db -8, 0, 75, $0
-; 0xaf829
AnimData128:: ; af829 (2b:7829)
frame_table AnimFrameTable52
@@ -4423,7 +4383,6 @@ AnimData128:: ; af829 (2b:7829) frame_data 8, 16, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf858
AnimFrameTable52:: ; af858 (2b:7858)
dw .data_af86a
@@ -4537,7 +4496,6 @@ AnimFrameTable52:: ; af858 (2b:7858) db -13, -23, 0, (1 << OAM_Y_FLIP)
db -21, -23, 2, (1 << OAM_Y_FLIP)
db -21, -31, 1, (1 << OAM_Y_FLIP)
-; 0xaf99f
AnimData129:: ; af99f (2b:799f)
frame_table AnimFrameTable53
@@ -4562,7 +4520,6 @@ AnimData129:: ; af99f (2b:799f) frame_data 0, 5, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf9f6
AnimFrameTable53:: ; af9f6 (2b:79f6)
dw .data_afa06
@@ -4885,7 +4842,6 @@ AnimFrameTable53:: ; af9f6 (2b:79f6) db 10, -32, 5, (1 << OAM_X_FLIP)
db -22, -32, 1, (1 << OAM_X_FLIP)
db -14, -32, 2, (1 << OAM_X_FLIP)
-; 0xafe8e
AnimData130:: ; afe8e (2b:7e8e)
frame_table AnimFrameTable54
@@ -4908,7 +4864,6 @@ AnimData130:: ; afe8e (2b:7e8e) frame_data 7, 8, 2, 4
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xafedd
AnimFrameTable54:: ; afedd (2b:7edd)
dw .data_afeed
@@ -4994,7 +4949,6 @@ AnimFrameTable54:: ; afedd (2b:7edd) db 8, -20, 0, $0
db 8, 8, 0, $0
db 16, -32, 0, $0
-; 0xaffc1
AnimData150:: ; affc1 (2b:7fc1)
frame_table AnimFrameTable71
@@ -5004,7 +4958,6 @@ AnimData150:: ; affc1 (2b:7fc1) frame_data 5, 8, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaffdc
AnimData162:: ; affdc (2b:7fdc)
frame_table AnimFrameTable78
@@ -5013,10 +4966,8 @@ AnimData162:: ; affdc (2b:7fdc) frame_data 24, 6, 0, 0
frame_data 24, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xafff3
AnimData166:: ; afff3 (2b:7ff3)
frame_table AnimFrameTable78
frame_data 0, 1, 0, 0
frame_data 0, 0, 0, 0
-; 0xafffe
diff --git a/src/data/anims3.asm b/src/data/anims3.asm index 076a65b..f990ffa 100644 --- a/src/data/anims3.asm +++ b/src/data/anims3.asm @@ -21,7 +21,6 @@ AnimData131:: ; b0000 (2c:4000) frame_data 6, 2, 0, 4
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0057
AnimFrameTable55:: ; b0057 (2c:4057)
dw .data_b0065
@@ -134,7 +133,6 @@ AnimFrameTable55:: ; b0057 (2c:4057) db -8, 0, 2, $0
db 0, -9, 6, $0
db 0, -1, 8, $0
-; 0xb01b4
AnimData132:: ; b01b4 (2c:41b4)
frame_table AnimFrameTable56
@@ -162,7 +160,6 @@ AnimData132:: ; b01b4 (2c:41b4) frame_data -1, 4, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0217
AnimFrameTable56:: ; b0217 (2c:4217)
dw .data_b0239
@@ -452,7 +449,6 @@ AnimFrameTable56:: ; b0217 (2c:4217) db -30, 6, 9, (1 << OAM_X_FLIP)
db -18, -6, 9, (1 << OAM_Y_FLIP)
db -18, 6, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb05b6
AnimData133:: ; b05b6 (2c:45b6)
frame_table AnimFrameTable57
@@ -470,7 +466,6 @@ AnimData133:: ; b05b6 (2c:45b6) frame_data 11, 16, 0, 0
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb05f1
AnimFrameTable57:: ; b05f1 (2c:45f1)
dw .data_b0609
@@ -761,7 +756,6 @@ AnimFrameTable57:: ; b05f1 (2c:45f1) db 0, -12, 44, $0
db -8, 3, 42, $0
db -8, -5, 44, $0
-; 0xb09d5
AnimData134:: ; b09d5 (2c:49d5)
frame_table AnimFrameTable58
@@ -782,7 +776,6 @@ AnimData134:: ; b09d5 (2c:49d5) frame_data 12, 8, 0, 0
frame_data 12, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0a1c
AnimFrameTable58:: ; b0a1c (2c:4a1c)
dw .data_b0a36
@@ -979,7 +972,6 @@ AnimFrameTable58:: ; b0a1c (2c:4a1c) db -8, 24, 3, $0
db -16, 32, 2, (1 << OAM_X_FLIP)
db -8, 32, 3, (1 << OAM_X_FLIP)
-; 0xb0c7b
AnimData135:: ; b0c7b (2c:4c7b)
frame_table AnimFrameTable59
@@ -993,7 +985,6 @@ AnimData135:: ; b0c7b (2c:4c7b) frame_data 7, 9, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0ca6
AnimFrameTable59:: ; b0ca6 (2c:4ca6)
dw .data_b0cb6
@@ -1094,7 +1085,6 @@ AnimFrameTable59:: ; b0ca6 (2c:4ca6) db -32, 40, 5, $0
db -24, 36, 6, $0
db -32, 32, 5, (1 << OAM_X_FLIP)
-; 0xb0dc6
AnimData136:: ; b0dc6 (2c:4dc6)
frame_table AnimFrameTable60
@@ -1116,7 +1106,6 @@ AnimData136:: ; b0dc6 (2c:4dc6) frame_data 3, 8, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0e11
AnimFrameTable60:: ; b0e11 (2c:4e11)
dw .data_b0e19
@@ -1191,7 +1180,6 @@ AnimFrameTable60:: ; b0e11 (2c:4e11) db 0, -16, 25, (1 << OAM_X_FLIP)
db 8, 0, 26, (1 << OAM_X_FLIP)
db 8, -8, 27, (1 << OAM_X_FLIP)
-; 0xb0efd
AnimData137:: ; b0efd (2c:4efd)
frame_table AnimFrameTable61
@@ -1205,7 +1193,6 @@ AnimData137:: ; b0efd (2c:4efd) frame_data 5, 6, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0f28
AnimFrameTable61:: ; b0f28 (2c:4f28)
dw .data_b0f34
@@ -1274,7 +1261,6 @@ AnimFrameTable61:: ; b0f28 (2c:4f28) db 4, -12, 2, (1 << OAM_X_FLIP)
db 12, -12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 12, -20, 2, (1 << OAM_Y_FLIP)
-; 0xb0fe2
AnimData138:: ; b0fe2 (2c:4fe2)
frame_table AnimFrameTable62
@@ -1296,7 +1282,6 @@ AnimData138:: ; b0fe2 (2c:4fe2) frame_data 7, 6, 0, 4
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb102d
AnimFrameTable62:: ; b102d (2c:502d)
dw .data_b103d
@@ -1395,7 +1380,6 @@ AnimFrameTable62:: ; b102d (2c:502d) db 16, -23, 5, $0
db 16, -15, 6, $0
db 8, -15, 4, $0
-; 0xb1145
AnimData139:: ; b1145 (2c:5145)
frame_table AnimFrameTable63
@@ -1426,7 +1410,6 @@ AnimData139:: ; b1145 (2c:5145) frame_data 0, 8, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb11b4
AnimFrameTable63:: ; b11b4 (2c:51b4)
dw .data_b11d2
@@ -1633,7 +1616,6 @@ AnimFrameTable63:: ; b11b4 (2c:51b4) db 16, 16, 2, (1 << OAM_Y_FLIP)
db 8, 16, 4, (1 << OAM_Y_FLIP)
db 0, 16, 10, (1 << OAM_Y_FLIP)
-; 0xb1421
AnimData140:: ; b1421 (2c:5421)
frame_table AnimFrameTable64
@@ -1654,7 +1636,6 @@ AnimData140:: ; b1421 (2c:5421) frame_data 14, 6, 0, 0
frame_data 14, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1468
AnimFrameTable64:: ; b1468 (2c:5468)
dw .data_b1486
@@ -1872,7 +1853,6 @@ AnimFrameTable64:: ; b1468 (2c:5468) db -24, -16, 0, (1 << OAM_X_FLIP)
db -48, 24, 0, (1 << OAM_X_FLIP)
db -48, 64, 0, (1 << OAM_X_FLIP)
-; 0xb1701
AnimData141:: ; b1701 (2c:5701)
frame_table AnimFrameTable65
@@ -1890,7 +1870,6 @@ AnimData141:: ; b1701 (2c:5701) frame_data 11, 16, 0, 0
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb173c
AnimFrameTable65:: ; b173c (2c:573c)
dw .data_b1754
@@ -2149,7 +2128,6 @@ AnimFrameTable65:: ; b173c (2c:573c) db -12, 8, 9, (1 << OAM_X_FLIP)
db -12, 0, 10, (1 << OAM_X_FLIP)
db -4, 8, 11, (1 << OAM_X_FLIP)
-; 0xb1aa0
AnimData142:: ; b1aa0 (2c:5aa0)
frame_table AnimFrameTable66
@@ -2162,7 +2140,6 @@ AnimData142:: ; b1aa0 (2c:5aa0) frame_data 6, 26, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1ac7
AnimFrameTable66:: ; b1ac7 (2c:5ac7)
dw .data_b1ad5
@@ -2313,7 +2290,6 @@ AnimFrameTable66:: ; b1ac7 (2c:5ac7) db 16, -8, 17, $0
db 16, 0, 18, $0
db 16, 8, 19, $0
-; 0xb1cbc
AnimData143:: ; b1cbc (2c:5cbc)
frame_table AnimFrameTable67
@@ -2338,7 +2314,6 @@ AnimData143:: ; b1cbc (2c:5cbc) frame_data 1, 2, -20, -7
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1d13
AnimFrameTable67:: ; b1d13 (2c:5d13)
dw .data_b1d17
@@ -2387,7 +2362,6 @@ AnimFrameTable67:: ; b1d13 (2c:5d13) db -71, -88, 1, (1 << OAM_X_FLIP)
db -72, -96, 2, (1 << OAM_X_FLIP)
db -64, -96, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb1db1
AnimData144:: ; b1db1 (2c:5db1)
frame_table AnimFrameTable68
@@ -2402,7 +2376,6 @@ AnimData144:: ; b1db1 (2c:5db1) frame_data 1, 8, 8, -10
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1de0
AnimFrameTable68:: ; b1de0 (2c:5de0)
dw .data_b1de6
@@ -2443,7 +2416,6 @@ AnimFrameTable68:: ; b1de0 (2c:5de0) db -7, 0, 12, (1 << OAM_X_FLIP)
db 1, 8, 13, (1 << OAM_X_FLIP)
db 1, 0, 14, (1 << OAM_X_FLIP)
-; 0xb1e51
AnimData145:: ; b1e51 (2c:5e51)
frame_table AnimFrameTable68
@@ -2479,7 +2451,6 @@ AnimData145:: ; b1e51 (2c:5e51) frame_data 1, 3, 32, 0
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1ed4
AnimData146:: ; b1ed4 (2c:5ed4)
frame_table AnimFrameTable69
@@ -2502,7 +2473,6 @@ AnimData146:: ; b1ed4 (2c:5ed4) frame_data 6, 9, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1f23
AnimFrameTable69:: ; b1f23 (2c:5f23)
dw .data_b1f31
@@ -2614,7 +2584,6 @@ AnimFrameTable69:: ; b1f23 (2c:5f23) db 8, -12, 6, (1 << OAM_X_FLIP)
db 16, 12, 5, (1 << OAM_X_FLIP)
db 24, 12, 6, (1 << OAM_X_FLIP)
-; 0xb207c
AnimData147:: ; b207c (2c:607c)
frame_table AnimFrameTable70
@@ -2640,7 +2609,6 @@ AnimData147:: ; b207c (2c:607c) frame_data 7, 16, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb20d7
AnimFrameTable70:: ; b20d7 (2c:60d7)
dw .data_b20e7
@@ -2800,7 +2768,6 @@ AnimFrameTable70:: ; b20d7 (2c:60d7) db 1, -8, 8, $0
db 1, 0, 9, $0
db 9, -5, 5, $0
-; 0xb22e3
AnimData148:: ; b22e3 (2c:62e3)
frame_table AnimFrameTable71
@@ -2809,7 +2776,6 @@ AnimData148:: ; b22e3 (2c:62e3) frame_data 7, 8, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb22fa
AnimFrameTable71:: ; b22fa (2c:62fa)
dw .data_b230a
@@ -2956,7 +2922,6 @@ AnimFrameTable71:: ; b22fa (2c:62fa) db -32, -32, 4, $0
db 24, -32, 4, $0
db -4, -40, 4, $0
-; 0xb24d2
AnimData151:: ; b24d2 (2c:64d2)
frame_table AnimFrameTable72
@@ -2981,7 +2946,6 @@ AnimData151:: ; b24d2 (2c:64d2) frame_data 2, 3, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2529
AnimFrameTable72:: ; b2529 (2c:6529)
dw .data_b2533
@@ -3051,7 +3015,6 @@ AnimFrameTable72:: ; b2529 (2c:6529) db 0, 8, 1, $0
db -36, -32, 0, $0
db 4, -24, 0, $0
-; 0xb25f4
AnimData152:: ; b25f4 (2c:65f4)
frame_table AnimFrameTable72
@@ -3082,7 +3045,6 @@ AnimData152:: ; b25f4 (2c:65f4) frame_data 3, 4, 8, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2663
AnimData153:: ; b2663 (2c:6663)
frame_table AnimFrameTable73
@@ -3107,7 +3069,6 @@ AnimData153:: ; b2663 (2c:6663) frame_data 2, 3, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb26ba
AnimFrameTable73:: ; b26ba (2c:66ba)
dw .data_b26c0
@@ -3143,7 +3104,6 @@ AnimFrameTable73:: ; b26ba (2c:66ba) db -28, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -28, -8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -28, -24, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb2717
AnimData154:: ; b2717 (2c:6717)
frame_table AnimFrameTable74
@@ -3158,7 +3118,6 @@ AnimData154:: ; b2717 (2c:6717) frame_data 2, 4, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2746
AnimFrameTable74:: ; b2746 (2c:6746)
dw .data_b274c
@@ -3185,7 +3144,6 @@ AnimFrameTable74:: ; b2746 (2c:6746) db -8, 0, 2, (1 << OAM_X_FLIP)
db 0, -8, 2, (1 << OAM_Y_FLIP)
db 0, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb277f
AnimData155:: ; b277f (2c:677f)
frame_table AnimFrameTable75
@@ -3204,7 +3162,6 @@ AnimData155:: ; b277f (2c:677f) frame_data 6, 6, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb27be
AnimFrameTable75:: ; b27be (2c:67be)
dw .data_b27cc
@@ -3335,7 +3292,6 @@ AnimFrameTable75:: ; b27be (2c:67be) db 0, 7, 4, (1 << OAM_Y_FLIP)
db 0, -1, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -8, -1, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb2963
AnimData156:: ; b2963 (2c:6963)
frame_table AnimFrameTable76
@@ -3348,7 +3304,6 @@ AnimData156:: ; b2963 (2c:6963) frame_data 3, 16, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb298a
AnimFrameTable76:: ; b298a (2c:698a)
dw .data_b2992
@@ -3388,7 +3343,6 @@ AnimFrameTable76:: ; b298a (2c:698a) db 1, 0, 1, (1 << OAM_X_FLIP)
db -7, -16, 5, $0
db -7, 8, 5, (1 << OAM_X_FLIP)
-; 0xb29ea
AnimData157:: ; b29ea (2c:69ea)
frame_table AnimFrameTable77
@@ -3436,7 +3390,6 @@ AnimData157:: ; b29ea (2c:69ea) frame_data 5, 2, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2a9d
AnimFrameTable77:: ; b2a9d (2c:6a9d)
dw .data_b2ab9
@@ -3695,7 +3648,6 @@ AnimFrameTable77:: ; b2a9d (2c:6a9d) db 0, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 1, -40, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 2, -48, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb2de7
AnimData158:: ; b2de7 (2c:6de7)
frame_table AnimFrameTable78
@@ -3709,7 +3661,6 @@ AnimData158:: ; b2de7 (2c:6de7) frame_data 0, 6, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2e12
AnimFrameTable78:: ; b2e12 (2c:6e12)
dw .data_b2e68
@@ -4228,7 +4179,6 @@ AnimFrameTable78:: ; b2e12 (2c:6e12) db -57, -52, 1, $0
db -49, -60, 3, $0
db -49, -52, 3, (1 << OAM_X_FLIP)
-; 0xb33f3
AnimData159:: ; b33f3 (2c:73f3)
frame_table AnimFrameTable78
@@ -4242,7 +4192,6 @@ AnimData159:: ; b33f3 (2c:73f3) frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb341e
AnimData160:: ; b341e (2c:741e)
frame_table AnimFrameTable78
@@ -4256,7 +4205,6 @@ AnimData160:: ; b341e (2c:741e) frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3449
AnimData161:: ; b3449 (2c:7449)
frame_table AnimFrameTable78
@@ -4270,7 +4218,6 @@ AnimData161:: ; b3449 (2c:7449) frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3474
AnimData163:: ; b3474 (2c:7474)
frame_table AnimFrameTable78
@@ -4282,7 +4229,6 @@ AnimData163:: ; b3474 (2c:7474) frame_data 30, 6, 0, 0
frame_data 30, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3497
AnimData164:: ; b3497 (2c:7497)
frame_table AnimFrameTable78
@@ -4294,7 +4240,6 @@ AnimData164:: ; b3497 (2c:7497) frame_data 36, 6, 0, 0
frame_data 36, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb34ba
AnimData165:: ; b34ba (2c:74ba)
frame_table AnimFrameTable78
@@ -4306,7 +4251,6 @@ AnimData165:: ; b34ba (2c:74ba) frame_data 42, 6, 0, 0
frame_data 42, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb34dd
AnimData167:: ; b34dd (2c:74dd)
frame_table AnimFrameTable79
@@ -4319,7 +4263,6 @@ AnimData167:: ; b34dd (2c:74dd) frame_data 2, 4, 0, 0
frame_data 6, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3504
AnimFrameTable79:: ; b3504 (2c:7504)
dw .data_b3512
@@ -4395,7 +4338,6 @@ AnimFrameTable79:: ; b3504 (2c:7504) db -8, -12, 19, (1 << OAM_Y_FLIP)
db -8, -4, 20, (1 << OAM_Y_FLIP)
db -8, 4, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb35cd
AnimData168:: ; b35cd (2c:75cd)
frame_table AnimFrameTable79
@@ -4434,7 +4376,6 @@ AnimData168:: ; b35cd (2c:75cd) frame_data 0, 2, 0, 5
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb365c
AnimData169:: ; b365c (2c:765c)
frame_table AnimFrameTable79
@@ -4473,26 +4414,22 @@ AnimData169:: ; b365c (2c:765c) frame_data 4, 2, 0, 5
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb36eb
AnimData170:: ; b36eb (2c:76eb)
frame_table AnimFrameTable79
frame_data 0, 1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb36f6
AnimData171:: ; b36f6 (2c:76f6)
frame_table AnimFrameTable79
frame_data 4, 1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3701
AnimData172:: ; b3701 (2c:7701)
frame_table AnimFrameTable80
frame_data 1, 30, 0, 0
frame_data -1, 30, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3710
AnimFrameTable80:: ; b3710 (2c:7710)
dw .data_b3716
@@ -4623,21 +4560,18 @@ AnimFrameTable80:: ; b3710 (2c:7710) db -20, -40, 15, $0
db -12, -40, 31, $0
db -4, -40, 47, $0
-; 0xb38e9
AnimData173:: ; b38e9 (2c:78e9)
frame_table AnimFrameTable80
frame_data 0, 30, 0, 0
frame_data -1, 30, 0, 0
frame_data 0, 0, 0, 0
-; 0xb38f8
AnimData174:: ; b38f8 (2c:78f8)
frame_table AnimFrameTable80
frame_data 2, 30, 0, 0
frame_data -1, 30, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3907
AnimData175:: ; b3907 (2c:7907)
frame_table AnimFrameTable81
@@ -4654,7 +4588,6 @@ AnimData175:: ; b3907 (2c:7907) frame_data 9, 4, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb393e
AnimFrameTable81:: ; b393e (2c:793e)
dw .data_b3982
@@ -5021,7 +4954,6 @@ AnimFrameTable81:: ; b393e (2c:793e) db -32, 6, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -32, -2, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -40, 6, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb3d34
AnimData176:: ; b3d34 (2c:7d34)
frame_table AnimFrameTable81
@@ -5060,14 +4992,12 @@ AnimData176:: ; b3d34 (2c:7d34) frame_data 21, 6, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3dc3
AnimData177:: ; b3dc3 (2c:7dc3)
frame_table AnimFrameTable81
frame_data 33, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3dd2
AnimData179:: ; b3dd2 (2c:7dd2)
frame_table AnimFrameTable82
@@ -5106,49 +5036,42 @@ AnimData179:: ; b3dd2 (2c:7dd2) frame_data 21, 6, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e61
AnimData180:: ; b3e61 (2c:7e61)
frame_table AnimFrameTable82
frame_data 33, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e70
AnimData182:: ; b3e70 (2c:7e70)
frame_table AnimFrameTable83
frame_data 18, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e7f
AnimData184:: ; b3e7f (2c:7e7f)
frame_table AnimFrameTable84
frame_data 18, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e8e
AnimData186:: ; b3e8e (2c:7e8e)
frame_table AnimFrameTable85
frame_data 8, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e9d
AnimData188:: ; b3e9d (2c:7e9d)
frame_table AnimFrameTable86
frame_data 8, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3eac
AnimData189:: ; b3eac (2c:7eac)
frame_table AnimFrameTable87
frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3ebb
AnimFrameTable87:: ; b3ebb (2c:7ebb)
dw .data_b3ebd
@@ -5187,14 +5110,12 @@ AnimFrameTable87:: ; b3ebb (2c:7ebb) db 24, 40, 29, $0
db 24, 48, 30, $0
db 24, 56, 31, $0
-; 0xb3f3e
AnimData190:: ; b3f3e (2c:7f3e)
frame_table AnimFrameTable88
frame_data 0, 37, 0, 0
frame_data -1, 26, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3f4d
AnimFrameTable88:: ; b3f4d (2c:7f4d)
dw .data_b3f4f
@@ -5221,7 +5142,6 @@ AnimFrameTable88:: ; b3f4d (2c:7f4d) db 6, 73, 19, $0
db 6, 65, 18, $0
db 6, 57, 17, $0
-; 0xb3fa0
AnimData196:: ; b3fa0 (2c:7fa0)
frame_table AnimFrameTable91
@@ -5243,4 +5163,3 @@ AnimData196:: ; b3fa0 (2c:7fa0) frame_data 0, 1, 3, 1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3feb
diff --git a/src/data/anims4.asm b/src/data/anims4.asm index 0d71da2..b4b193f 100644 --- a/src/data/anims4.asm +++ b/src/data/anims4.asm @@ -13,7 +13,6 @@ AnimData178:: ; b4000 (2d:4000) frame_data 9, 4, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb4037
AnimFrameTable82:: ; b4037 (2d:4037)
dw .data_b407b
@@ -380,7 +379,6 @@ AnimFrameTable82:: ; b4037 (2d:4037) db -32, 6, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -32, -2, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -40, 6, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb442d
AnimData181:: ; b442d (2d:442d)
frame_table AnimFrameTable83
@@ -404,7 +402,6 @@ AnimData181:: ; b442d (2d:442d) frame_data 17, 4, 0, 0
frame_data -1, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xb4480
AnimFrameTable83:: ; b4480 (2d:4480)
dw .data_b44a6
@@ -837,7 +834,6 @@ AnimFrameTable83:: ; b4480 (2d:4480) db -8, 6, 3, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -8, -2, 4, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -16, 6, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb4a41
AnimData183:: ; b4a41 (2d:4a41)
frame_table AnimFrameTable84
@@ -861,7 +857,6 @@ AnimData183:: ; b4a41 (2d:4a41) frame_data 17, 4, 0, 0
frame_data -1, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xb4a94
AnimFrameTable84:: ; b4a94 (2d:4a94)
dw .data_b4aba
@@ -1294,7 +1289,6 @@ AnimFrameTable84:: ; b4a94 (2d:4a94) db -8, 6, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -8, -2, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -16, 6, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb5055
AnimData185:: ; b5055 (2d:5055)
frame_table AnimFrameTable85
@@ -1307,7 +1301,6 @@ AnimData185:: ; b5055 (2d:5055) frame_data 6, 8, 0, 0
frame_data 7, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb507c
AnimFrameTable85:: ; b507c (2d:507c)
dw .data_b508e
@@ -1464,7 +1457,6 @@ AnimFrameTable85:: ; b507c (2d:507c) db 0, 6, 20, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, -2, 21, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 6, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xb526f
AnimData187:: ; b526f (2d:526f)
frame_table AnimFrameTable86
@@ -1477,7 +1469,6 @@ AnimData187:: ; b526f (2d:526f) frame_data 6, 8, 0, 0
frame_data 7, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5296
AnimFrameTable86:: ; b5296 (2d:5296)
dw .data_b52a8
@@ -1634,14 +1625,12 @@ AnimFrameTable86:: ; b5296 (2d:5296) db 0, -2, 21, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 6, 20, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 6, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xb5489
AnimData191:: ; b5489 (2d:5489)
frame_table AnimFrameTable89
frame_data 0, 37, 0, 0
frame_data -1, 26, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5498
AnimFrameTable89:: ; b5498 (2d:5498)
dw .data_b549a
@@ -1668,7 +1657,6 @@ AnimFrameTable89:: ; b5498 (2d:5498) db 6, 73, 19, $0
db 6, 65, 18, $0
db 6, 57, 17, $0
-; 0xb54eb
AnimData192:: ; b54eb (2d:54eb)
frame_table AnimFrameTable90
@@ -1762,7 +1750,6 @@ AnimData192:: ; b54eb (2d:54eb) frame_data 0, 1, 2, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5656
AnimFrameTable90:: ; b5656 (2d:5656)
dw .data_b5658
@@ -1773,7 +1760,6 @@ AnimFrameTable90:: ; b5656 (2d:5656) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb5669
AnimData193:: ; b5669 (2d:5669)
frame_table AnimFrameTable90
@@ -1867,7 +1853,6 @@ AnimData193:: ; b5669 (2d:5669) frame_data 0, 1, -2, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb57d4
AnimData194:: ; b57d4 (2d:57d4)
frame_table AnimFrameTable91
@@ -1991,7 +1976,6 @@ AnimData194:: ; b57d4 (2d:57d4) frame_data 0, 1, 0, 2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb59b7
AnimFrameTable91:: ; b59b7 (2d:59b7)
dw .data_b59b9
@@ -2002,7 +1986,6 @@ AnimFrameTable91:: ; b59b7 (2d:59b7) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb59ca
AnimData195:: ; b59ca (2d:59ca)
frame_table AnimFrameTable91
@@ -2055,7 +2038,6 @@ AnimData195:: ; b59ca (2d:59ca) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5a91
AnimData197:: ; b5a91 (2d:5a91)
frame_table AnimFrameTable92
@@ -2197,7 +2179,6 @@ AnimData197:: ; b5a91 (2d:5a91) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5cbc
AnimFrameTable92:: ; b5cbc (2d:5cbc)
dw .data_b5cbe
@@ -2208,7 +2189,6 @@ AnimFrameTable92:: ; b5cbc (2d:5cbc) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb5ccf
AnimData198:: ; b5ccf (2d:5ccf)
frame_table AnimFrameTable92
@@ -2276,7 +2256,6 @@ AnimData198:: ; b5ccf (2d:5ccf) frame_data 0, 17, -2, -1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5dd2
AnimData199:: ; b5dd2 (2d:5dd2)
frame_table AnimFrameTable92
@@ -2288,7 +2267,6 @@ AnimData199:: ; b5dd2 (2d:5dd2) frame_data 0, 1, -1, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5df5
AnimData200:: ; b5df5 (2d:5df5)
frame_table AnimFrameTable93
@@ -2420,7 +2398,6 @@ AnimData200:: ; b5df5 (2d:5df5) frame_data 0, 1, 0, 2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5ff8
AnimFrameTable93:: ; b5ff8 (2d:5ff8)
dw .data_b5ffa
@@ -2431,7 +2408,6 @@ AnimFrameTable93:: ; b5ff8 (2d:5ff8) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb600b
AnimData201:: ; b600b (2d:600b)
frame_table AnimFrameTable93
@@ -2484,7 +2460,6 @@ AnimData201:: ; b600b (2d:600b) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb60d2
AnimData202:: ; b60d2 (2d:60d2)
frame_table AnimFrameTable93
@@ -2506,7 +2481,6 @@ AnimData202:: ; b60d2 (2d:60d2) frame_data 0, 1, -3, 1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb611d
AnimData203:: ; b611d (2d:611d)
frame_table AnimFrameTable94
@@ -2604,7 +2578,6 @@ AnimData203:: ; b611d (2d:611d) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6298
AnimFrameTable94:: ; b6298 (2d:6298)
dw .data_b629a
@@ -2615,7 +2588,6 @@ AnimFrameTable94:: ; b6298 (2d:6298) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb62ab
AnimData204:: ; b62ab (2d:62ab)
frame_table AnimFrameTable94
@@ -2693,7 +2665,6 @@ AnimData204:: ; b62ab (2d:62ab) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb63d6
AnimData205:: ; b63d6 (2d:63d6)
frame_table AnimFrameTable94
@@ -2709,7 +2680,6 @@ AnimData205:: ; b63d6 (2d:63d6) frame_data 0, 1, 1, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6409
AnimData206:: ; b6409 (2d:6409)
frame_table AnimFrameTable95
@@ -2815,7 +2785,6 @@ AnimData206:: ; b6409 (2d:6409) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb65a4
AnimFrameTable95:: ; b65a4 (2d:65a4)
dw .data_b65a6
@@ -2826,7 +2795,6 @@ AnimFrameTable95:: ; b65a4 (2d:65a4) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb65b7
AnimData207:: ; b65b7 (2d:65b7)
frame_table AnimFrameTable95
@@ -2904,7 +2872,6 @@ AnimData207:: ; b65b7 (2d:65b7) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb66e2
AnimData208:: ; b66e2 (2d:66e2)
frame_table AnimFrameTable95
@@ -2920,7 +2887,6 @@ AnimData208:: ; b66e2 (2d:66e2) frame_data 0, 1, -1, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6715
AnimData209:: ; b6715 (2d:6715)
frame_table AnimFrameTable96
@@ -3054,7 +3020,6 @@ AnimData209:: ; b6715 (2d:6715) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6920
AnimFrameTable96:: ; b6920 (2d:6920)
dw .data_b6922
@@ -3065,7 +3030,6 @@ AnimFrameTable96:: ; b6920 (2d:6920) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb6933
AnimData210:: ; b6933 (2d:6933)
frame_table AnimFrameTable96
@@ -3133,7 +3097,6 @@ AnimData210:: ; b6933 (2d:6933) frame_data 0, 17, 2, -1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6a36
AnimData211:: ; b6a36 (2d:6a36)
frame_table AnimFrameTable96
@@ -3145,7 +3108,6 @@ AnimData211:: ; b6a36 (2d:6a36) frame_data 0, 1, 1, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6a59
AnimData212:: ; b6a59 (2d:6a59)
frame_table AnimFrameTable97
@@ -3243,7 +3205,6 @@ AnimData212:: ; b6a59 (2d:6a59) frame_data 0, 1, 0, 2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6bd4
AnimFrameTable97:: ; b6bd4 (2d:6bd4)
dw .data_b6bd6
@@ -3254,7 +3215,6 @@ AnimFrameTable97:: ; b6bd4 (2d:6bd4) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb6be7
AnimData213:: ; b6be7 (2d:6be7)
frame_table AnimFrameTable97
@@ -3307,7 +3267,6 @@ AnimData213:: ; b6be7 (2d:6be7) frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6cae
AnimData214:: ; b6cae (2d:6cae)
frame_table AnimFrameTable97
@@ -3343,7 +3302,6 @@ AnimData214:: ; b6cae (2d:6cae) frame_data 0, 1, 0, 1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6d31
AnimData215:: ; b6d31 (2d:6d31)
frame_table AnimFrameTable98
@@ -3547,7 +3505,6 @@ AnimData215:: ; b6d31 (2d:6d31) frame_data 0, 1, -1, -1
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb7054
AnimFrameTable98:: ; b7054 (2d:7054)
dw .data_b7056
@@ -3558,7 +3515,6 @@ AnimFrameTable98:: ; b7054 (2d:7054) db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb7067
AnimData216:: ; b7067 (2d:7067)
frame_table AnimFrameTable98
@@ -3762,4 +3718,3 @@ AnimData216:: ; b7067 (2d:7067) frame_data 0, 1, -1, -1
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb738a
diff --git a/src/data/auto_deck_card_lists.asm b/src/data/auto_deck_card_lists.asm index 8dbf6e5..e53ff22 100644 --- a/src/data/auto_deck_card_lists.asm +++ b/src/data/auto_deck_card_lists.asm @@ -1156,4 +1156,3 @@ MysteriousPokemonCardList: ; 1b8c3 (6:78c3) db 2, SWITCH
db 1, POKEMON_CENTER
db 0 ; end of list
-; 0x1b8e8
diff --git a/src/data/auto_deck_machines.asm b/src/data/auto_deck_machines.asm index 17ca823..2eccbf1 100644 --- a/src/data/auto_deck_machines.asm +++ b/src/data/auto_deck_machines.asm @@ -79,4 +79,3 @@ AutoDeckMachineEntries: ; 1b8e8 (6:78e8) auto_deck LegendaryArticunoCardList, LegendaryArticunoText, LegendaryArticunoDescriptionText
auto_deck LegendaryDragoniteCardList, LegendaryDragoniteText, LegendaryDragoniteDescriptionText
auto_deck MysteriousPokemonCardList, MysteriousPokemonText, MysteriousPokemonDescriptionText
-; 0x1ba14
diff --git a/src/data/duel_animations.asm b/src/data/duel_animations.asm index 49ed364..278e106 100644 --- a/src/data/duel_animations.asm +++ b/src/data/duel_animations.asm @@ -775,4 +775,3 @@ Animations: ; 1ce32 (7:4e32) db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
-; 0x1d078
diff --git a/src/data/map_ow_frameset_pointers.asm b/src/data/map_ow_frameset_pointers.asm index 3210533..732fb5b 100644 --- a/src/data/map_ow_frameset_pointers.asm +++ b/src/data/map_ow_frameset_pointers.asm @@ -34,4 +34,3 @@ MapOWFramesetPointers: ; 805d6 (20:45d6) dw DefaultOWFrameset, DefaultOWFrameset ; POKEMON_DOME_ENTRANCE
dw DefaultOWFrameset, DefaultOWFrameset ; POKEMON_DOME
dw HallOfHonorOWFrameset, HallOfHonorOWFrameset ; HALL_OF_HONOR
-; 0x8065e
diff --git a/src/data/map_ow_framesets.asm b/src/data/map_ow_framesets.asm index dec17be..261836c 100644 --- a/src/data/map_ow_framesets.asm +++ b/src/data/map_ow_framesets.asm @@ -242,4 +242,3 @@ HallOfHonorOWFrameset: ; 80b36 (20:4b36) ow_frame 0, $a6, 0, HallOfHonorTilesetGfx, $2e
ow_frame 0, $a7, 0, HallOfHonorTilesetGfx, $2f
db -1 ; end
-; 0x80b7a
diff --git a/src/data/overworld_indexes.asm b/src/data/overworld_indexes.asm index 86f20c2..dfc7b85 100644 --- a/src/data/overworld_indexes.asm +++ b/src/data/overworld_indexes.asm @@ -5,15 +5,15 @@ ; 4: 00 OverworldMapIndexes: ; 10f88 (4:4f88) db $00, $00, $00, $00 - db MASON_LABORATORY, $0E, $1A, $00 + db MASON_LABORATORY, $0e, $1a, $00 db ISHIHARAS_HOUSE, $08, $14, $00 - db FIGHTING_CLUB_ENTRANCE, $08, $0E, $00 - db ROCK_CLUB_ENTRANCE, $08, $0E, $00 - db WATER_CLUB_ENTRANCE, $08, $0E, $00 - db LIGHTNING_CLUB_ENTRANCE, $08, $0E, $00 - db GRASS_CLUB_ENTRANCE, $08, $0E, $00 - db PSYCHIC_CLUB_ENTRANCE, $08, $0E, $00 - db SCIENCE_CLUB_ENTRANCE, $08, $0E, $00 - db FIRE_CLUB_ENTRANCE, $08, $0E, $00 - db CHALLENGE_HALL_ENTRANCE, $08, $0E, $00 - db POKEMON_DOME_ENTRANCE, $0E, $0E, $00 + db FIGHTING_CLUB_ENTRANCE, $08, $0e, $00 + db ROCK_CLUB_ENTRANCE, $08, $0e, $00 + db WATER_CLUB_ENTRANCE, $08, $0e, $00 + db LIGHTNING_CLUB_ENTRANCE, $08, $0e, $00 + db GRASS_CLUB_ENTRANCE, $08, $0e, $00 + db PSYCHIC_CLUB_ENTRANCE, $08, $0e, $00 + db SCIENCE_CLUB_ENTRANCE, $08, $0e, $00 + db FIRE_CLUB_ENTRANCE, $08, $0e, $00 + db CHALLENGE_HALL_ENTRANCE, $08, $0e, $00 + db POKEMON_DOME_ENTRANCE, $0e, $0e, $00 diff --git a/src/data/sequences/credits_sequence.asm b/src/data/sequences/credits_sequence.asm index 2c12413..e7dcd37 100644 --- a/src/data/sequences/credits_sequence.asm +++ b/src/data/sequences/credits_sequence.asm @@ -397,4 +397,3 @@ CreditsSequence: ; 1daef (7:5aef) credits_seq_fade_in
credits_seq_wait 225
credits_seq_end
-; 0x1e1c4
diff --git a/src/data/sequences/opening_sequence.asm b/src/data/sequences/opening_sequence.asm index 1a25c31..a9f8e3a 100644 --- a/src/data/sequences/opening_sequence.asm +++ b/src/data/sequences/opening_sequence.asm @@ -45,4 +45,3 @@ OpeningSequence: ; 1d59d (7:559d) opening_seq_play_title_screen_music
opening_seq_wait 60
opening_seq_end
-; 0x1d614
diff --git a/src/data/warps.asm b/src/data/warps.asm index 828db63..6261122 100644 --- a/src/data/warps.asm +++ b/src/data/warps.asm @@ -43,208 +43,208 @@ WarpDataPointers: ; 1c099 (7:4099) ; 5: y coordinate of connected map ; double null terminated MasonLaboratoryWarpData: ; 1c0dd (7:40dd) - db $0E, $1C, OVERWORLD_MAP, $00, $00 - db $10, $1C, OVERWORLD_MAP, $00, $00 - db $1A, $0A, DECK_MACHINE_ROOM, $02, $0A - db $1A, $0C, DECK_MACHINE_ROOM, $02, $0C + db $0e, $1c, OVERWORLD_MAP, $00, $00 + db $10, $1c, OVERWORLD_MAP, $00, $00 + db $1a, $0a, DECK_MACHINE_ROOM, $02, $0a + db $1a, $0c, DECK_MACHINE_ROOM, $02, $0c db $00, $00 DeckMachineRoomWarpData: ; 1c0f3 (7:40f3) - db $00, $0A, MASON_LABORATORY, $18, $0A - db $00, $0C, MASON_LABORATORY, $18, $0C + db $00, $0a, MASON_LABORATORY, $18, $0a + db $00, $0c, MASON_LABORATORY, $18, $0c db $00, $00 IshiharasHouseWarpData: ; 1c0ff (7:40ff) db $08, $16, OVERWORLD_MAP, $00, $00 - db $0A, $16, OVERWORLD_MAP, $00, $00 + db $0a, $16, OVERWORLD_MAP, $00, $00 db $00, $00 FightingClubEntranceWarpData: ; 1c10b (7:410b) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, FIGHTING_CLUB_LOBBY, $18, $0A - db $00, $08, FIGHTING_CLUB_LOBBY, $18, $0C - db $08, $00, FIGHTING_CLUB, $0A, $0E - db $0A, $00, FIGHTING_CLUB, $0C, $0E + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, FIGHTING_CLUB_LOBBY, $18, $0a + db $00, $08, FIGHTING_CLUB_LOBBY, $18, $0c + db $08, $00, FIGHTING_CLUB, $0a, $0e + db $0a, $00, FIGHTING_CLUB, $0c, $0e db $00, $00 FightingClubLobbyWarpData: ; 1c12b (7:412b) - db $1A, $0A, FIGHTING_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, FIGHTING_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, FIGHTING_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, FIGHTING_CLUB_ENTRANCE, $02, $08 db $00, $00 FightingClubWarpData: ; 1c137 (7:4137) - db $0A, $10, FIGHTING_CLUB_ENTRANCE, $08, $02 - db $0C, $10, FIGHTING_CLUB_ENTRANCE, $0A, $02 + db $0a, $10, FIGHTING_CLUB_ENTRANCE, $08, $02 + db $0c, $10, FIGHTING_CLUB_ENTRANCE, $0a, $02 db $00, $00 RockClubEntranceWarpData: ; 1c143 (7:4143) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, ROCK_CLUB_LOBBY, $18, $0A - db $00, $08, ROCK_CLUB_LOBBY, $18, $0C - db $08, $00, ROCK_CLUB, $0C, $1A - db $0A, $00, ROCK_CLUB, $0E, $1A + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, ROCK_CLUB_LOBBY, $18, $0a + db $00, $08, ROCK_CLUB_LOBBY, $18, $0c + db $08, $00, ROCK_CLUB, $0c, $1a + db $0a, $00, ROCK_CLUB, $0e, $1a db $00, $00 RockClubLobbyWarpData: ; 1c163 (7:4163) - db $1A, $0A, ROCK_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, ROCK_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, ROCK_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, ROCK_CLUB_ENTRANCE, $02, $08 db $00, $00 RockClubWarpData: ; 1c16f (7:416f) - db $0C, $1C, ROCK_CLUB_ENTRANCE, $08, $02 - db $0E, $1C, ROCK_CLUB_ENTRANCE, $0A, $02 + db $0c, $1c, ROCK_CLUB_ENTRANCE, $08, $02 + db $0e, $1c, ROCK_CLUB_ENTRANCE, $0a, $02 db $00, $00 WaterClubEntranceWarpData: ; 1c17b (7:417b) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, WATER_CLUB_LOBBY, $18, $0A - db $00, $08, WATER_CLUB_LOBBY, $18, $0C - db $08, $00, WATER_CLUB, $0C, $1C - db $0A, $00, WATER_CLUB, $0E, $1C + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, WATER_CLUB_LOBBY, $18, $0a + db $00, $08, WATER_CLUB_LOBBY, $18, $0c + db $08, $00, WATER_CLUB, $0c, $1c + db $0a, $00, WATER_CLUB, $0e, $1c db $00, $00 WaterClubLobbyWarpData: ; 1c19b (7:419b) - db $1A, $0A, WATER_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, WATER_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, WATER_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, WATER_CLUB_ENTRANCE, $02, $08 db $00, $00 WaterClubWarpData: ; 1c1a7 (7:41a7) - db $0C, $1E, WATER_CLUB_ENTRANCE, $08, $02 - db $0E, $1E, WATER_CLUB_ENTRANCE, $0A, $02 + db $0c, $1e, WATER_CLUB_ENTRANCE, $08, $02 + db $0e, $1e, WATER_CLUB_ENTRANCE, $0a, $02 db $00, $00 LightningClubEntranceWarpData: ; 1c1b3 (7:41b3) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, LIGHTNING_CLUB_LOBBY, $18, $0A - db $00, $08, LIGHTNING_CLUB_LOBBY, $18, $0C - db $08, $00, LIGHTNING_CLUB, $0C, $1C - db $0A, $00, LIGHTNING_CLUB, $0E, $1C + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, LIGHTNING_CLUB_LOBBY, $18, $0a + db $00, $08, LIGHTNING_CLUB_LOBBY, $18, $0c + db $08, $00, LIGHTNING_CLUB, $0c, $1c + db $0a, $00, LIGHTNING_CLUB, $0e, $1c db $00, $00 LightningClubLobbyWarpData: ; 1c1d3 (7:41d3) - db $1A, $0A, LIGHTNING_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, LIGHTNING_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, LIGHTNING_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, LIGHTNING_CLUB_ENTRANCE, $02, $08 db $00, $00 LightningClubWarpData: ; 1c1df (7:41df) - db $0C, $1E, LIGHTNING_CLUB_ENTRANCE, $08, $02 - db $0E, $1E, LIGHTNING_CLUB_ENTRANCE, $0A, $02 + db $0c, $1e, LIGHTNING_CLUB_ENTRANCE, $08, $02 + db $0e, $1e, LIGHTNING_CLUB_ENTRANCE, $0a, $02 db $00, $00 GrassClubEntranceWarpData: ; 1c1eb (7:41eb) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, GRASS_CLUB_LOBBY, $18, $0A - db $00, $08, GRASS_CLUB_LOBBY, $18, $0C - db $08, $00, GRASS_CLUB, $0C, $1C - db $0A, $00, GRASS_CLUB, $0E, $1C + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, GRASS_CLUB_LOBBY, $18, $0a + db $00, $08, GRASS_CLUB_LOBBY, $18, $0c + db $08, $00, GRASS_CLUB, $0c, $1c + db $0a, $00, GRASS_CLUB, $0e, $1c db $00, $00 GrassClubLobbyWarpData: ; 1c20b (7:420b) - db $1A, $0A, GRASS_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, GRASS_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, GRASS_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, GRASS_CLUB_ENTRANCE, $02, $08 db $00, $00 GrassClubWarpData: ; 1c217 (7:4217) - db $0C, $1E, GRASS_CLUB_ENTRANCE, $08, $02 - db $0E, $1E, GRASS_CLUB_ENTRANCE, $0A, $02 + db $0c, $1e, GRASS_CLUB_ENTRANCE, $08, $02 + db $0e, $1e, GRASS_CLUB_ENTRANCE, $0a, $02 db $00, $00 PsychicClubEntranceWarpData: ; 1c223 (7:4223) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, PSYCHIC_CLUB_LOBBY, $18, $0A - db $00, $08, PSYCHIC_CLUB_LOBBY, $18, $0C - db $08, $00, PSYCHIC_CLUB, $0C, $18 - db $0A, $00, PSYCHIC_CLUB, $0E, $18 + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, PSYCHIC_CLUB_LOBBY, $18, $0a + db $00, $08, PSYCHIC_CLUB_LOBBY, $18, $0c + db $08, $00, PSYCHIC_CLUB, $0c, $18 + db $0a, $00, PSYCHIC_CLUB, $0e, $18 db $00, $00 PsychicClubLobbyWarpData: ; 1c243 (7:4243) - db $1A, $0A, PSYCHIC_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, PSYCHIC_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, PSYCHIC_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, PSYCHIC_CLUB_ENTRANCE, $02, $08 db $00, $00 PsychicClubWarpData: ; 1c24f (7:424f) - db $0C, $1A, PSYCHIC_CLUB_ENTRANCE, $08, $02 - db $0E, $1A, PSYCHIC_CLUB_ENTRANCE, $0A, $02 + db $0c, $1a, PSYCHIC_CLUB_ENTRANCE, $08, $02 + db $0e, $1a, PSYCHIC_CLUB_ENTRANCE, $0a, $02 db $00, $00 ScienceClubEntranceWarpData: ; 1c25b (7:425b) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, SCIENCE_CLUB_LOBBY, $18, $0A - db $00, $08, SCIENCE_CLUB_LOBBY, $18, $0C - db $08, $00, SCIENCE_CLUB, $0C, $1C - db $0A, $00, SCIENCE_CLUB, $0E, $1C + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, SCIENCE_CLUB_LOBBY, $18, $0a + db $00, $08, SCIENCE_CLUB_LOBBY, $18, $0c + db $08, $00, SCIENCE_CLUB, $0c, $1c + db $0a, $00, SCIENCE_CLUB, $0e, $1c db $00, $00 ScienceClubLobbyWarpData: ; 1c27b (7:427b) - db $1A, $0A, SCIENCE_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, SCIENCE_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, SCIENCE_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, SCIENCE_CLUB_ENTRANCE, $02, $08 db $00, $00 ScienceClubWarpData: ; 1c287 (7:4287) - db $0C, $1E, SCIENCE_CLUB_ENTRANCE, $08, $02 - db $0E, $1E, SCIENCE_CLUB_ENTRANCE, $0A, $02 + db $0c, $1e, SCIENCE_CLUB_ENTRANCE, $08, $02 + db $0e, $1e, SCIENCE_CLUB_ENTRANCE, $0a, $02 db $00, $00 FireClubEntranceWarpData: ; 1c293 (7:4293) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, FIRE_CLUB_LOBBY, $18, $0A - db $00, $08, FIRE_CLUB_LOBBY, $18, $0C - db $08, $00, FIRE_CLUB, $0C, $1C - db $0A, $00, FIRE_CLUB, $0E, $1C + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, FIRE_CLUB_LOBBY, $18, $0a + db $00, $08, FIRE_CLUB_LOBBY, $18, $0c + db $08, $00, FIRE_CLUB, $0c, $1c + db $0a, $00, FIRE_CLUB, $0e, $1c db $00, $00 FireClubLobbyWarpData: ; 1c2b3 (7:42b3) - db $1A, $0A, FIRE_CLUB_ENTRANCE, $02, $06 - db $1A, $0C, FIRE_CLUB_ENTRANCE, $02, $08 + db $1a, $0a, FIRE_CLUB_ENTRANCE, $02, $06 + db $1a, $0c, FIRE_CLUB_ENTRANCE, $02, $08 db $00, $00 FireClubWarpData: ; 1c2bf (7:42bf) - db $0C, $1E, FIRE_CLUB_ENTRANCE, $08, $02 - db $0E, $1E, FIRE_CLUB_ENTRANCE, $0A, $02 + db $0c, $1e, FIRE_CLUB_ENTRANCE, $08, $02 + db $0e, $1e, FIRE_CLUB_ENTRANCE, $0a, $02 db $00, $00 ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb) db $08, $10, OVERWORLD_MAP, $00, $00 - db $0A, $10, OVERWORLD_MAP, $00, $00 - db $00, $06, CHALLENGE_HALL_LOBBY, $18, $0A - db $00, $08, CHALLENGE_HALL_LOBBY, $18, $0C - db $08, $00, CHALLENGE_HALL, $0E, $1C - db $0A, $00, CHALLENGE_HALL, $10, $1C + db $0a, $10, OVERWORLD_MAP, $00, $00 + db $00, $06, CHALLENGE_HALL_LOBBY, $18, $0a + db $00, $08, CHALLENGE_HALL_LOBBY, $18, $0c + db $08, $00, CHALLENGE_HALL, $0e, $1c + db $0a, $00, CHALLENGE_HALL, $10, $1c db $00, $00 ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb) - db $1A, $0A, CHALLENGE_HALL_ENTRANCE, $02, $06 - db $1A, $0C, CHALLENGE_HALL_ENTRANCE, $02, $08 + db $1a, $0a, CHALLENGE_HALL_ENTRANCE, $02, $06 + db $1a, $0c, CHALLENGE_HALL_ENTRANCE, $02, $08 db $00, $00 ChallengeHallWarpData: ; 1c2f7 (7:42f7) - db $0E, $1E, CHALLENGE_HALL_ENTRANCE, $08, $02 - db $10, $1E, CHALLENGE_HALL_ENTRANCE, $0A, $02 + db $0e, $1e, CHALLENGE_HALL_ENTRANCE, $08, $02 + db $10, $1e, CHALLENGE_HALL_ENTRANCE, $0a, $02 db $00, $00 PokemonDomeEntranceWarpData: ; 1c303 (7:4303) - db $0E, $10, OVERWORLD_MAP, $00, $00 + db $0e, $10, OVERWORLD_MAP, $00, $00 db $10, $10, OVERWORLD_MAP, $00, $00 - db $16, $00, POKEMON_DOME, $0E, $1C - db $18, $00, POKEMON_DOME, $10, $1C + db $16, $00, POKEMON_DOME, $0e, $1c + db $18, $00, POKEMON_DOME, $10, $1c db $00, $00 PokemonDomeWarpData: ; 1c319 (7:4319) - db $0E, $1E, POKEMON_DOME_ENTRANCE, $16, $02 - db $10, $1E, POKEMON_DOME_ENTRANCE, $18, $02 - db $0E, $00, HALL_OF_HONOR, $0A, $16 - db $10, $00, HALL_OF_HONOR, $0C, $16 + db $0e, $1e, POKEMON_DOME_ENTRANCE, $16, $02 + db $10, $1e, POKEMON_DOME_ENTRANCE, $18, $02 + db $0e, $00, HALL_OF_HONOR, $0a, $16 + db $10, $00, HALL_OF_HONOR, $0c, $16 db $00, $00 HallOfHonorWarpData: ; 1c32f (7:432f) - db $0A, $18, POKEMON_DOME, $0E, $02 - db $0C, $18, POKEMON_DOME, $10, $02 + db $0a, $18, POKEMON_DOME, $0e, $02 + db $0c, $18, POKEMON_DOME, $10, $02 db $00, $00 diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 9994dac..d79e604 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -26,7 +26,7 @@ _OpenDuelCheckMenu: ; 8000 (2:4000) call JumpToFunctionInTable jr _OpenDuelCheckMenu -.jump_table: ; 8031 (2:4031) +.jump_table dw DuelCheckMenu_InPlayArea dw DuelCheckMenu_Glossary dw DuelCheckMenu_YourPlayArea @@ -92,7 +92,7 @@ DuelCheckMenu_YourPlayArea: ; 8047 (2:4047) call JumpToFunctionInTable jr .draw -.jump_table ; 8098 (2:4098) +.jump_table dw OpenYourOrOppPlayAreaScreen_TurnHolderPlayArea dw OpenYourOrOppPlayAreaScreen_TurnHolderHand dw OpenYourOrOppPlayAreaScreen_TurnHolderDiscardPile @@ -1367,7 +1367,6 @@ DrawCheckMenuCursor_YourOrOppPlayArea: ; 8743 (2:4743) call WriteByteToBGMap0 or a ret -; 0x8760 DisplayCheckMenuCursor_YourOrOppPlayArea: ; 8760 (2:4760) ld a, SYM_CURSOR_R ; load cursor byte @@ -1484,7 +1483,7 @@ endr db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -.SelectedPrize: ; 8819 (2:4819) +.SelectedPrize ; 8819 (2:4819) ld a, [wYourOrOppPlayAreaCurPosition] ld c, a ld b, $1 @@ -1684,7 +1683,6 @@ _DrawAIPeekScreen: ; 8932 (2:4932) ret z call SwapTurn ret -; 0x8992 LoadCursorTile: ; 8992 (2:4992) ld de, v0Tiles0 @@ -2016,7 +2014,6 @@ _SelectPrizeCards: ; 8aaa (2:4aaa) cursor_transition $30, $38, $20, $01, $05, $02, $02 cursor_transition $08, $48, $00, $02, $00, $05, $05 cursor_transition $30, $48, $20, $03, $01, $04, $04 -; 0x8b85 _DrawPlayAreaToPlacePrizeCards: ; 8b85 (2:4b85) xor a @@ -2068,7 +2065,6 @@ _DrawPlayAreaToPlacePrizeCards: ; 8b85 (2:4b85) db 0, 0 db 0, 4 db 0, 2 -; 0x8bf2 ; seems like a function to draw prize cards ; given a list of coordinates in hl @@ -2125,13 +2121,13 @@ Func_8bf2: ; 8bf2 (2:4bf2) .done pop af ret -; 0x8c3f ; unknown data ; unreferenced? Data_8c3f: ; 8c3f (6:4c3f) - db $06, $05, $06, $06, $07, $05, $07, $06, $08, $05, $08, $06, $05, $0e, $05, $0d, $04, $0e, $04, $0d, $03, $0e, $03, $0d -; 0x8c57 + db $06, $05, $06, $06, $07, $05, $07, $06 + db $08, $05, $08, $06, $05, $0e, $05, $0d + db $04, $0e, $04, $0d, $03, $0e, $03, $0d ; gets the first prize card index that is set ; beginning from index in register a @@ -2184,9 +2180,8 @@ GetFirstSetPrizeCard: ; 8c57 (2:4c57) ld a, b pop bc ret -; 0x8c8e -OpenGlossaryScreen_TransitionTable: +OpenGlossaryScreen_TransitionTable: ; 8c8e (2:4c8e) cursor_transition $08, $28, $00, $04, $01, $05, $05 cursor_transition $08, $38, $00, $00, $02, $06, $06 cursor_transition $08, $48, $00, $01, $03, $07, $07 @@ -2214,7 +2209,6 @@ CopyDeckFromSRAM: ; 8cd4 (2:4cd4) call DisableSRAM pop bc ret -; 0x8ce7 ; clears some WRAM addresses to act as ; terminator bytes to wFilteredCardList and wCurDeckCards @@ -2229,7 +2223,6 @@ WriteCardListsTerminatorBytes: ; 8ce7 (2:4ce7) add hl, bc ld [hl], a ; wCurDeckCardsTerminator ret -; 0x8cf9 ; inits some SRAM addresses Func_8cf9: ; 8cf9 (2:4cf9) @@ -2271,7 +2264,6 @@ EmptyScreenAndLoadFontDuelAndHandCardsIcons: ; 8d56 (2:4d56) lb de, $3c, $bf call SetupText ret -; 0x8d78 ; empties screen, zeroes object positions, ; loads cursor tile, symbol fonts, duel card symbols @@ -2291,7 +2283,6 @@ Func_8d78: ; 8d78 (2:4d78) lb de, $3c, $bf call SetupText ret -; 0x8d9d ; inits the following deck building params from hl: ; wMaxNumCardsAllowed @@ -2316,7 +2307,6 @@ DeckBuildingParams: ; 8da9 (2:4da9) db TRUE ; whether to include deck cards dw HandleDeckConfigurationMenu dw DeckConfigurationMenu_TransitionTable -; 0x8db0 DeckSelectionMenu: ; 8db0 (2:4db0) ld hl, DeckBuildingParams @@ -2387,7 +2377,6 @@ HandleStartButtonInDeckSelectionMenu: ; 8dea (2:4dea) ld a, [wCurDeck] scf ret -; 0x8e1f OpenDeckConfirmationMenu: ; 8e1f (2:4e1f) ; copy deck name @@ -2409,7 +2398,6 @@ OpenDeckConfirmationMenu: ; 8e1f (2:4e1f) ld [hl], a call HandleDeckConfirmationMenu ret -; 0x8e42 ; handles the submenu when selecting a deck ; (Modify Deck, Select Deck, Change Name and Cancel) @@ -2603,7 +2591,6 @@ InputCurDeckName: ; 8f05 (2:4f05) ld [hl], e call DisableSRAM ret -; 0x8f8a ; handle deck selection sub-menu ; the option is either "Select Deck" or "Cancel" @@ -2658,7 +2645,6 @@ DeckSelectionSubMenu_SelectOrCancel: ; 8f8a (2:4f8a) call DrawWideTextBox_WaitForInput ld a, [wCurDeck] jp DeckSelectionMenu.init_menu_params -; 0x8fe8 PrintThereIsNoDeckHereText: ; 8fe8 (2:4fe8) ldtx hl, ThereIsNoDeckHereText @@ -2679,7 +2665,6 @@ CheckIfCurDeckIsValid: ; 8ff2 (2:4ff2) ret nz ; is valid scf ret ; is not valid -; 0x9001 ; write to $d00a the decimal representation (number characters) ; of the value in hl @@ -2709,7 +2694,6 @@ Func_9001: ; 9001 (2:5001) sbc b ld h, a ret -; 0x9026 CancelDeckSelectionSubMenu: ; 9026 (2:5026) ret @@ -2720,7 +2704,6 @@ DeckSelectionData: ; 9027 (2:5027) textitem 2, 16, ChangeNameText textitem 12, 16, CancelText db $ff -; 0x9038 ; return, in hl, the pointer to sDeckXName where X is [wCurDeck] + 1 GetPointerToDeckName: ; 9038 (2:5038) @@ -2920,7 +2903,6 @@ DecrementDeckCardsInCollection: ; 910a (2:510a) .done pop hl ret -; 0x9120 ; like AddDeckToCollection, but takes care to ; check if increasing the collection count would @@ -2968,7 +2950,6 @@ AddGiftCenterDeckCardsToCollection: ; 9120 (2:5120) .done pop hl ret -; 0x9152 ; adds all cards in deck in hl to player's collection ; assumes SRAM is enabled @@ -3109,7 +3090,6 @@ DrawDecksScreen: ; 9168 (2:5168) call DrawHandCardsTileOnCurDeck call EnableLCD ret -; 0x9242 DeckNameMenuData: ; 9242 (2:5242) textitem 4, 2, Deck1Text @@ -3117,7 +3097,6 @@ DeckNameMenuData: ; 9242 (2:5242) textitem 4, 8, Deck3Text textitem 4, 11, Deck4Text db $ff -; 0x9253 ; copies text from hl to wDefaultText ; with " deck" appended to the end @@ -3194,7 +3173,6 @@ CopyListFromHLToDEInSRAM: ; 92b4 (2:52b4) call CopyListFromHLToDE call DisableSRAM ret -; 0x92be ; appends text in hl to wDefaultText ; then adds "deck" to the end @@ -3241,7 +3219,6 @@ AppendDeckName: ; 92be (2:52be) .text_start db " deck " .text_end -; 0x9314 ; returns carry if the deck in hl ; is not valid, that is, has no cards @@ -3286,7 +3263,6 @@ DrawHandCardsTileAtDE: ; 9339 (2:5339) lb bc, 2, 2 call FillRectangle ret -; 0x9345 ; handles user input when selecting a card filter ; when building a deck configuration @@ -3442,7 +3418,6 @@ HandleDeckBuildScreen: ; 9345 (2:5345) ld a, [wCurCardTypeFilter] ld [wTempCardTypeFilter], a jp .wait_input -; 0x9461 OpenDeckConfigurationMenu: ; 9461 (2:5461) xor a @@ -3464,7 +3439,6 @@ OpenDeckConfigurationMenu: ; 9461 (2:5461) ld h, [hl] ld l, a jp hl -; 0x9480 HandleDeckConfigurationMenu: ; 9480 (2:5480) lb de, 0, 0 @@ -3507,7 +3481,6 @@ HandleDeckConfigurationMenu: ; 9480 (2:5480) dw SaveDeckConfiguration ; Save dw DismantleDeck ; Dismantle dw CancelDeckModifications ; Cancel -; 0x94d3 ConfirmDeckConfiguration: ; 94d3 (2:54d3) ld hl, wCardListVisibleOffset @@ -3530,12 +3503,10 @@ ConfirmDeckConfiguration: ; 94d3 (2:54d3) ld a, [wced6] ld [wCardListCursorPos], a ret -; 0x9505 ModifyDeckConfiguration: ; 9505 (2:5505) add sp, $2 jr HandleDeckConfigurationMenu.draw_icons -; 0x9509 ; returns carry set if player chose to go back CancelDeckModifications: ; 9509 (2:5509) @@ -3592,7 +3563,6 @@ SaveDeckConfiguration: ; 951a (2:551a) add sp, $2 scf ret -; 0x9566 DismantleDeck: ; 9566 (2:5566) ldtx hl, DismantleThisDeckText @@ -3630,13 +3600,11 @@ DismantleDeck: ; 9566 (2:5566) call DisableSRAM add sp, $2 ret -; 0x95b9 ChangeDeckName: ; 95b9 (2:55b9) call InputCurDeckName add sp, $2 jp HandleDeckBuildScreen.skip_count -; 0x95c1 ; returns carry if current deck was changed ; either through its card configuration or its name @@ -3712,7 +3680,6 @@ CheckIfCurrentDeckWasChanged: ; 95c1 (2:55c1) call DisableSRAM scf ret -; 0x9622 ; returns carry if doesn't have a valid deck ; aside from the current deck @@ -3750,7 +3717,6 @@ CheckIfHasOtherValidDecks: ; 9622 (2:5622) ; has cards, is the only valid deck! scf ret -; 0x9649 ; checks if wCurDeckCards has any basics ; returns carry set if there is at least @@ -3776,7 +3742,6 @@ CheckIfThereAreAnyBasicCardsInDeck: ; 9649 (2:5649) .no_carry or a ret -; 0x9667 FiltersCardSelectionParams: ; 9667 (2:5667) db 1 ; x pos @@ -3824,7 +3789,6 @@ DrawCardTypeIconsAndPrintCardCounts: ; 96a3 (2:56a3) call PrintSlashSixty call EnableLCD ret -; 0x96c7 ; fills one line at coordinate bc in BG Map ; with the byte in register a @@ -3843,7 +3807,6 @@ FillBGMapLineWithA: ; 96c7 (2:56c7) call FillDEWithA call BankswitchVRAM0 ret -; 0x96e3 ; saves the count of each type of card that is in wCurDeckCards ; stores these values in wCardFilterCounts @@ -3858,7 +3821,6 @@ CountNumberOfCardsForEachCardType: ; 96e3 (2:56e3) call CountNumberOfCardsOfType ld [hli], a jr .loop -; 0x96f4 ; fills de with b bytes of the value in register a FillDEWithA: ; 96f4 (2:56f4) @@ -3871,7 +3833,6 @@ FillDEWithA: ; 96f4 (2:56f4) jr nz, .loop pop hl ret -; 0x96fd ; draws all the card type icons ; in a line specified by .CardTypeIcons @@ -3924,7 +3885,6 @@ DrawCardTypeIcons: ; 96fd (2:56fd) db ICON_TILE_TRAINER, 15, 2 db ICON_TILE_ENERGY, 17, 2 db $00 -; 0x9751 DeckBuildMenuData: ; 9751 (1:5751) ; x, y, text id @@ -3956,7 +3916,6 @@ PrintSlashSixty: ; 976a (2:576a) ld hl, wDefaultText call ProcessText ret -; 0x978b ; creates two separate lists given the card type in register a ; if a card matches the card type given, then it's added to wFilteredCardList @@ -4051,7 +4010,6 @@ CreateFilteredCardList: ; 978b (2:578b) pop bc pop af ret -; 0x9803 ; returns carry if card ID in register e is not ; found in any of the decks saved in SRAM @@ -4099,7 +4057,6 @@ IsCardInAnyDeck: ; 9803 (2:5803) call DisableSRAM or a ret -; 0x9843 ; preserves all registers ; hl = start of bytes to set to $0 @@ -4118,7 +4075,6 @@ ClearNBytesFromHL: ; 9843 (2:5843) pop bc pop af ret -; 0x9850 ; returns the number of times that card e ; appears in wCurDeckCards @@ -4138,7 +4094,6 @@ GetCountOfCardInCurDeck: ; 9850 (2:5850) ld a, d pop hl ret -; 0x9863 ; returns total count of card ID e ; looks it up in wFilteredCardList @@ -4168,7 +4123,6 @@ GetOwnedCardCount: ; 9863 (2:5863) xor a pop hl ret -; 0x9880 ; appends text "X/Y", where X is the number of included cards ; and Y is the total number of cards in storage of a given card ID @@ -4203,7 +4157,6 @@ AppendOwnedCardCountAndStorageCountNumbers: ; 9880 (2:5880) pop bc pop af ret -; 0x98a6 ; determines the ones and tens digits in a for printing ; the ones place is added $20 (SYM_0) so that it maps to a numerical character @@ -4262,7 +4215,6 @@ ConvertToNumericalDigits: ; 98c7 (2:58c7) ld a, b ld [hli], a ret -; 0x98dc ; counts the number of cards in wCurDeckCards ; that are the same type as input in register a @@ -4322,7 +4274,6 @@ CountNumberOfCardsOfType: ; 98dc (2:58dc) pop hl pop de ret -; 0x9916 ; prints the card count of each individual card type ; assumes CountNumberOfCardsForEachCardType was already called @@ -4350,7 +4301,6 @@ PrintCardTypeCounts: ; 9916 (2:5916) ld hl, wDefaultText call ProcessText ret -; 0x993d ; prints the list of cards, applying the filter from register a ; the counts of each card displayed is taken from wCurDeck @@ -4393,7 +4343,6 @@ PrintFilteredCardList: ; 993d (2:593d) call PrintDeckBuildingCardList pop af ret -; 0x997d ; used to filter the cards in the deck building/card selection screen CardTypeFilters: ; 997d (2:597d) @@ -4407,7 +4356,6 @@ CardTypeFilters: ; 997d (2:597d) db FILTER_TRAINER db FILTER_ENERGY db -1 ; end of list -; 0x9987 ; counts all the cards from each card type ; (stored in wCardFilterCounts) and store it in wTotalCardCount @@ -4436,7 +4384,6 @@ PrintTotalCardCount: ; 9987 (2:5987) ld hl, wDefaultText call ProcessText ret -; 0x99b0 ; prints the name, level and storage count of the cards ; that are visible in the list window @@ -4622,7 +4569,6 @@ AddCardIDToVisibleList: ; 9a59 (2:5a59) pop bc pop af ret -; 0x9a6d ; copies data from hl to: ; wCardListCursorXPos @@ -4647,7 +4593,6 @@ InitCardSelectionParams: ; 9a6d (2:5a6d) xor a ld [wCheckMenuCursorBlinkCounter], a ret -; 0x9a83 HandleCardSelectionInput: ; 9a83 (2:5a83) xor a ; FALSE @@ -4702,7 +4647,6 @@ HandleCardSelectionInput: ; 9a83 (2:5a83) call PlaySFXConfirmOrCancel scf ret -; 0x9ad7 ; outputs cursor position in e and selection in a ConfirmSelectionAndReturnCarry: ; 9ad7 (2:5ad7) @@ -4714,7 +4658,6 @@ ConfirmSelectionAndReturnCarry: ; 9ad7 (2:5ad7) ld a, [hffb3] scf ret -; 0x9ae8 HandleCardSelectionCursorBlink: ; 9ae8 (2:5ae8) ld a, [wPlaysSfx] @@ -4730,7 +4673,6 @@ HandleCardSelectionCursorBlink: ; 9ae8 (2:5ae8) ld a, [wVisibleCursorTile] bit 4, [hl] jr z, DrawHorizontalListCursor -; 0x9b00 DrawHorizontalListCursor_Invisible: ; 9b00 (2:5b00) ld a, [wInvisibleCursorTile] @@ -4758,12 +4700,10 @@ DrawHorizontalListCursor: ; 9b03 (2:5b03) call WriteByteToBGMap0 or a ret -; 0x9b20 DrawHorizontalListCursor_Visible: ; 9b20 (2:5b20) ld a, [wVisibleCursorTile] jr DrawHorizontalListCursor -; 0x9b25 ; handles user input when selecting cards to add ; to deck configuration @@ -4948,12 +4888,10 @@ DrawListCursor: ; 9c11 (2:5c11) call WriteByteToBGMap0 or a ret -; 0x9c3a DrawListCursor_Visible: ; 9c3a (2:5c3a) ld a, [wVisibleCursorTile] jr DrawListCursor -; 0x9c3f OpenCardPageFromCardList: ; 9c3f (2:5c3f) ; get the card index that is selected @@ -5066,7 +5004,6 @@ OpenCardPageFromCardList: ; 9c3f (2:5c3f) ld a, [wCardListCursorPos] ld [wTempCardListCursorPos], a ret -; 0x9ced ; opens card page from the card list ; unreferenced? @@ -5086,7 +5023,6 @@ Func_9ced: ; 9ced (2:5ced) ld a, $01 ld [wVBlankOAMCopyToggle], a ret -; 0x9d0c ; adds card in register e to deck configuration ; and updates the values shown for its count @@ -5104,7 +5040,6 @@ AddCardToDeckAndUpdateCount: ; 9d0c (2:5d0c) call GetCountOfCardInCurDeck call PrintNumberValueInCursorYPos ret -; 0x9d22 ; tries to add card ID in register e to wCurDeckCards ; fails to add card if one of the following conditions are met: @@ -5236,7 +5171,6 @@ TryAddCardToDeck: ; 9d22 (2:5d22) .exit or a ret -; 0x9db3 ; gets the element in wVisibleListCardIDs ; corresponding to index wCardListCursorPos @@ -5248,7 +5182,6 @@ GetSelectedVisibleCardID: ; 9db3 (2:5db3) add hl, de ld e, [hl] ret -; 0x9dbf ; appends the digits of value in register a to wDefaultText ; then prints it in cursor Y position @@ -5271,7 +5204,6 @@ PrintNumberValueInCursorYPos: ; 9dbf (2:5dbf) ld hl, wDefaultText call ProcessText ret -; 0x9de4 ; removes card in register e from deck configuration ; and updates the values shown for its count @@ -5289,7 +5221,6 @@ RemoveCardFromDeckAndUpdateCount: ; 9de4 (2:5de4) call GetCountOfCardInCurDeck call PrintNumberValueInCursorYPos ret -; 0x9dfa ; removes card ID in e from wCurDeckCards RemoveCardFromDeck: ; 9dfa (2:5dfa) @@ -5339,7 +5270,6 @@ RemoveCardFromDeck: ; 9dfa (2:5dfa) xor a ld [bc], a ret -; 0x9e31 UpdateConfirmationCardScreen: ; 9e31 (2:5e31) ld hl, hffb0 @@ -5348,7 +5278,6 @@ UpdateConfirmationCardScreen: ; 9e31 (2:5e31) ld hl, hffb0 ld [hl], $00 jp PrintConfirmationCardList -; 0x9e41 HandleDeckConfirmationMenu: ; 9e41 (2:5e41) ; if deck is empty, just show deck info header with empty card list @@ -5425,7 +5354,6 @@ HandleDeckConfirmationMenu: ; 9e41 (2:5e41) db SYM_CURSOR_R ; visible cursor tile db SYM_SPACE ; invisible cursor tile dw NULL ; wCardListHandlerFunction -; 0x9eb8 ; handles pressing left/right in card lists ; scrolls up/down a number of wCardListNumCursorPositions @@ -5475,7 +5403,6 @@ HandleLeftRightInCardList: ; 9eb8 (2:5eb8) .asm_9efa scf ret -; 0x9efc ; handles scrolling up and down with Select button ; in this case, the cursor position goes up/down @@ -5525,7 +5452,6 @@ HandleSelectUpAndDownInList: ; 9efc (2:5efc) .set_carry scf ret -; 0x9f40 ; simply draws the deck info header ; then awaits a b button press to exit @@ -5539,7 +5465,6 @@ ShowDeckInfoHeaderAndWaitForBButton: ; 9f40 (2:5f40) ld a, $ff call PlaySFXConfirmOrCancel ret -; 0x9f52 ShowConfirmationCardScreen: ; 9f52 (2:5f52) call ShowDeckInfoHeader @@ -5550,7 +5475,6 @@ ShowConfirmationCardScreen: ; 9f52 (2:5f52) ld [hl], d call PrintConfirmationCardList ret -; 0x9f62 ; counts all values stored in wCardFilterCounts ; if the total count is 0, then @@ -5574,7 +5498,6 @@ TallyCardsInCardFilterLists: ; 9f62 (2:5f62) ldtx hl, NoCardsChosenText call ProcessTextFromID ret -; 0x9f81 ; draws a box on the top of the screen ; with wCurDeck's number, name and card count @@ -5609,7 +5532,6 @@ ShowDeckInfoHeader: ; 9f81 (2:5f81) call TallyCardsInCardFilterLists call EnableLCD ret -; 0x9fc0 ; prints the name of wCurDeck in the form ; "X· <deck name> deck", where X is the number @@ -5670,7 +5592,6 @@ PrintCurDeckNumberAndName: ; 9fc0 (2:5fc0) call InitTextPrinting call ProcessText ret -; 0xa028 ; sorts wCurDeckCards by ID SortCurDeckCardsByID: ; a028 (2:6028) @@ -5733,7 +5654,6 @@ SortCurDeckCardsByID: ; a028 (2:6028) xor a ld [hl], a ret -; 0xa06e ; goes through list in wCurDeckCards, and for each card in it ; creates list in wUniqueDeckCardList of all unique cards @@ -5759,7 +5679,6 @@ CreateCurDeckUniqueCardList: ; a06e (2:606e) ld a, b ld [wNumUniqueCards], a ret -; 0xa08a ; prints the list of cards visible in the window ; of the confirmation screen @@ -5942,7 +5861,6 @@ PrintConfirmationCardList: ; a08a (2:608a) pop de pop hl ret -; 0xa173 ; returns in a the BG Pal corresponding to the ; card type icon in input register a @@ -5981,7 +5899,6 @@ GetCardTypeIconPalette: ; a173 (2:6173) db ICON_TILE_STAGE_2_POKEMON, 1 db ICON_TILE_TRAINER, 2 db $00, $ff -; 0xa1a2 ; inits WRAM vars to start creating deck configuration to send PrepareToBuildDeckConfigurationToSend: ; a1a2 (2:61a2) @@ -6008,7 +5925,6 @@ PrepareToBuildDeckConfigurationToSend: ; a1a2 (2:61a2) db FALSE ; whether to include deck cards dw HandleSendDeckConfigurationMenu dw SendDeckConfigurationMenu_TransitionTable -; 0xa1df SendDeckConfigurationMenu_TransitionTable: ; a1df (2:61df) cursor_transition $10, $20, $00, $00, $00, $01, $02 @@ -6082,7 +5998,6 @@ HandleSendDeckConfigurationMenu: ; a201 (2:6201) add sp, $2 or a ret -; 0xa281 ; copies b bytes from hl to de CopyNBytesFromHLToDE: ; a281 (2:6281) @@ -6092,7 +6007,6 @@ CopyNBytesFromHLToDE: ; a281 (2:6281) dec b jr nz, CopyNBytesFromHLToDE ret -; 0xa288 ; handles the screen showing all the player's cards HandlePlayersCardsScreen: ; a288 (2:6288) @@ -6226,7 +6140,6 @@ HandlePlayersCardsScreen: ; a288 (2:6288) ld hl, hffb0 ld [hl], $00 jp .wait_input -; 0xa396 Data_a396: ; a396 (2:6396) db 1 ; x pos @@ -6237,7 +6150,6 @@ Data_a396: ; a396 (2:6396) db SYM_CURSOR_R ; visible cursor tile db SYM_SPACE ; invisible cursor tile dw NULL ; wCardListHandlerFunction -; 0xa39f ; a = which card type filter PrintFilteredCardSelectionList: ; a39f (2:639f) @@ -6265,7 +6177,6 @@ PrintFilteredCardSelectionList: ; a39f (2:639f) call PrintCardSelectionList pop af ret -; 0xa3ca ; outputs in wTempCardCollection all the cards in sCardCollection ; plus the cards that are being used in built decks @@ -6305,7 +6216,6 @@ CreateCardCollectionListWithDeckCards: ; a3ca (2:63ca) ld de, sDeck4Cards call IncrementDeckCardsInTempCollection ret -; 0xa412 ; goes through cards in deck in de ; and for each card ID, increments its corresponding @@ -6330,7 +6240,6 @@ IncrementDeckCardsInTempCollection: ; a412 (2:6412) .done call DisableSRAM ret -; 0xa42d ; prints the name, level and storage count of the cards ; that are visible in the list window @@ -6431,7 +6340,6 @@ PrintCardSelectionList: ; a42d (2:642d) call WriteByteToBGMap0 pop bc ret -; 0xa4ae ; appends the card count given in register e ; to the list in hl, in numerical form @@ -6457,7 +6365,6 @@ AppendOwnedCardCountNumber: ; a4ae (2:64ae) pop bc pop af ret -; 0xa4c6 ; print header info (card count and player name) PrintPlayersCardsHeaderInfo: ; a4c6 (2:64c6) @@ -6471,7 +6378,6 @@ PrintPlayersCardsHeaderInfo: ; a4c6 (2:64c6) call PrintPlayersCardsText call DrawCardTypeIcons ret -; 0xa4de ; prints "<PLAYER>'s cards" PrintPlayersCardsText: ; a4de (2:64de) @@ -6490,7 +6396,6 @@ PrintPlayersCardsText: ; a4de (2:64de) ldtx hl, SCardsText call ProcessTextFromID ret -; 0xa504 PrintTotalNumberOfCardsInCollection: ; a504 (2:6504) ld a, ALL_DECKS @@ -6594,7 +6499,6 @@ PrintTotalNumberOfCardsInCollection: ; a504 (2:6504) sbc b ld h, a ret -; 0xa596 ; fills wFilteredCardList and wOwnedCardsCountList ; with cards IDs and counts, respectively, @@ -6804,7 +6708,6 @@ CreateCardSetList: ; a596 (2:6596) push hl ld e, MEW2 jr .PlaceCardInList -; 0xa6a0 ; a = CARD_SET_* constant CreateCardSetListAndInitListCoords: ; a6a0 (2:66a0) @@ -6863,7 +6766,6 @@ CreateCardSetListAndInitListCoords: ; a6a0 (2:66a0) ld [hl], e pop af ret -; 0xa6fa ; prints the cards being shown in the Card Album screen ; for the corresponding Card Set @@ -7071,7 +6973,6 @@ PrintCardSetListEntries: ; a6fa (2:66fa) pop de pop bc ret -; 0xa828 ; handles opening card page, and inputs when inside Card Album HandleCardAlbumCardPage: ; a828 (2:6828) @@ -7209,7 +7110,6 @@ HandleCardAlbumCardPage: ; a828 (2:6828) ld a, [wCardListCursorPos] ld [wTempCardListCursorPos], a ret -; 0xa901 GetFirstOwnedCardIndex: ; a901 (2:6901) ld hl, wOwnedCardsCountList @@ -7224,7 +7124,6 @@ GetFirstOwnedCardIndex: ; a901 (2:6901) ld a, b ld [wFirstOwnedCardIndex], a ret -; 0xa913 HandleCardAlbumScreen: ; a913 (2:6913) ld a, $01 @@ -7560,7 +7459,6 @@ HandleCardAlbumScreen: ; a913 (2:6913) textitem 5, 9, Item4LaboratoryText textitem 5, 11, Item5PromotionalCardText db $ff -; 0xab7b PrinterMenu_PokemonCards: ; ab7b (2:6b7b) call WriteCardListsTerminatorBytes @@ -7750,7 +7648,6 @@ PrinterMenu_PokemonCards: ; ab7b (2:6b7b) call FillRectangle call BankswitchVRAM0 ret -; 0xad0e Data_ad05: ; ad05 (2:6d05) db 3 ; x pos @@ -7761,7 +7658,6 @@ Data_ad05: ; ad05 (2:6d05) db SYM_CURSOR_R ; visible cursor tile db SYM_SPACE ; invisible cursor tile dw NULL ; wCardListHandlerFunction -; 0xad0e PrinterMenu_CardList: ; ad0e (2:6d0e) call WriteCardListsTerminatorBytes @@ -7792,7 +7688,6 @@ PrinterMenu_CardList: ; ad0e (2:6d0e) ret nz bank1call PrintCardList ret -; 0xad51 HandlePrinterMenu: ; ad51 (2:6d51) bank1call PreparePrinterConnection @@ -7824,14 +7719,12 @@ HandlePrinterMenu: ; ad51 (2:6d51) call JumpToFunctionInTable ld a, [wcfe4] jr .loop -; 0xad9a PrinterMenu_QuitPrint: ; ad9a (2:6d9a) add sp, $2 ; exit menu ldtx hl, PleaseMakeSureToTurnGameBoyPrinterOffText call DrawWideTextBox_WaitForInput ret -; 0xada3 PrinterMenuFunctionTable: ; ada3 (2:6da3) dw PrinterMenu_PokemonCards @@ -7839,7 +7732,6 @@ PrinterMenuFunctionTable: ; ada3 (2:6da3) dw PrinterMenu_CardList dw PrinterMenu_PrintQuality dw PrinterMenu_QuitPrint -; 0xadad PrinterMenuParameters: ; adad (2:6dad) db 5, 2 ; cursor x, cursor y @@ -7848,7 +7740,6 @@ PrinterMenuParameters: ; adad (2:6dad) db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; 0xadb5 PrinterMenu_PrintQuality: ; adb5 (2:6db5) ldtx hl, PleaseSetTheContrastText @@ -7876,7 +7767,6 @@ PrinterMenu_PrintQuality: ; adb5 (2:6db5) ldtx hl, WhatWouldYouLikeToPrintText call DrawWideTextBox_PrintText jr HandlePrinterMenu.loop_input -; 0xadf5 Data_adf5: ; adf5 (2:6df5) db 5 ; x pos @@ -7887,7 +7777,6 @@ Data_adf5: ; adf5 (2:6df5) db SYM_CURSOR_R ; visible cursor tile db SYM_SPACE ; invisible cursor tile dw NULL ; wCardListHandlerFunction -; 0xadfe ; handles printing and player input ; in the card confirmation list shown @@ -8054,7 +7943,6 @@ HandleDeckMissingCardsList: ; adfe (2:6dfe) call InitTextPrinting call ProcessText ret -; 0xaf1d Func_af1d: ; af1d (2:6f1d) xor a @@ -8112,7 +8000,6 @@ Func_af1d: ; af1d (2:6f1d) ; never reached scf ret -; 0xaf98 Func_af98: ; af98 (2:6f98) xor a @@ -8230,7 +8117,6 @@ ShowReceivedCardsList: ; b053 (2:7053) ld hl, hffb0 ld [hl], $00 jp PrintCardSelectionList -; 0xb088 Func_b088: ; b088 (2:7088) ld a, CARD_COLLECTION_SIZE - 1 @@ -8342,7 +8228,6 @@ Func_b088: ; b088 (2:7088) pop bc pop af ret -; 0xb131 PrintCardToSendText: ; b131 (2:7131) call EmptyScreenAndDrawTextBox @@ -8351,7 +8236,6 @@ PrintCardToSendText: ; b131 (2:7131) ldtx hl, CardToSendText call ProcessTextFromID ret -; 0xb141 PrintReceivedTheseCardsText: ; b141 (2:7141) call EmptyScreenAndDrawTextBox @@ -8368,7 +8252,6 @@ PrintReceivedTheseCardsText: ; b141 (2:7141) ldtx hl, ReceivedTheseCardsFromText call DrawWideTextBox_PrintText ret -; 0xb167 EmptyScreenAndDrawTextBox: ; b167 (2:7167) call Set_OBJ_8x8 @@ -8377,7 +8260,6 @@ EmptyScreenAndDrawTextBox: ; b167 (2:7167) lb bc, 20, 13 call DrawRegularTextBox ret -; 0xb177 Func_b177: ; b177 (2:7177) ld a, [wd10e] @@ -8401,7 +8283,6 @@ Func_b177: ; b177 (2:7177) dw Func_af98 dw Func_bc04 dw Func_bc7a -; 0xb19d HandleDeckSaveMachineMenu: ; b19d (2:719d) xor a @@ -8521,7 +8402,6 @@ HandleDeckSaveMachineMenu: ; b19d (2:719d) textitem 2, 16, BuildADeckText textitem 12, 16, CancelText db $ff -; 0xb285 ; sets the number of cursor positions for deck machine menu, ; sets the text ID to show given by de @@ -8543,7 +8423,6 @@ InitDeckMachineDrawingParams: ; b285 (2:7285) xor a ld [wced2], a ret -; 0xb29f ; handles player input inside the Deck Machine screen ; the Start button opens up the deck confirmation menu @@ -8665,7 +8544,6 @@ HandleDeckMachineSelection: ; b29f (2:729f) .set_carry scf ret -; 0xb35b ; returns carry if deck corresponding to the ; entry selected in the Deck Machine menu is empty @@ -8688,7 +8566,6 @@ CheckIfSelectedDeckMachineEntryIsEmpty: ; b35b (2:735b) ret nz ; is valid scf ret; is empty -; 0xb379 ClearScreenAndDrawDeckMachineScreen: ; b379 (2:7379) call Set_OBJ_8x8 @@ -8712,7 +8589,6 @@ ClearScreenAndDrawDeckMachineScreen: ; b379 (2:7379) call GetSavedDeckCount call EnableLCD ret -; 0xb3b3 ; prints wDeckMachineTitleText as title text SetDeckMachineTitleText: ; b3b3 (2:73b3) @@ -8724,7 +8600,6 @@ SetDeckMachineTitleText: ; b3b3 (2:73b3) ld l, a call ProcessTextFromID ret -; 0xb3c3 ; save all sSavedDecks pointers in wMachineDeckPtrs GetSavedDeckPointers: ; b3c3 (2:73c3) @@ -8749,7 +8624,6 @@ GetSavedDeckPointers: ; b3c3 (2:73c3) dec a jr nz, .loop_saved_decks ret -; 0xb3e5 ; given the cursor position in the deck machine menu ; prints the deck names of all entries that are visible @@ -8772,12 +8646,10 @@ PrintVisibleDeckMachineEntries: ; b3e5 (2:73e5) inc e inc e jr .loop -; 0xb3fe UpdateDeckMachineScrollArrowsAndEntries: ; b3fe (2:73fe) call DrawListScrollArrows jr PrintVisibleDeckMachineEntries -; 0xb403 DrawDeckMachineScreen: ; b403 (2:7403) call DrawListScrollArrows @@ -8794,7 +8666,6 @@ DrawDeckMachineScreen: ; b403 (2:7403) ld hl, hffb0 ld [hl], $00 jr PrintVisibleDeckMachineEntries -; 0xb424 ; prints the deck name of the deck corresponding ; to index in register a, from wMachineDeckPtrs @@ -8976,7 +8847,6 @@ PrintDeckMachineEntry: ; b424 (2:7424) ld a, c call DisableSRAM ret -; 0xb525 ; counts how many decks in sSavedDecks are not empty ; stores value in wNumSavedDecks @@ -9001,7 +8871,6 @@ GetSavedDeckCount: ; b525 (2:7525) ld [wNumSavedDecks], a call DisableSRAM ret -; 0xb545 ; prints "[wNumSavedDecks]/60" PrintNumSavedDecks: ; b545 (2:7545) @@ -9020,7 +8889,6 @@ PrintNumSavedDecks: ; b545 (2:7545) ld hl, wDefaultText call ProcessText ret -; 0xb568 ; prints "X/Y" where X is the current list index ; and Y is the total number of saved decks @@ -9045,7 +8913,6 @@ Func_b568: ; b568 (2:7568) ld hl, wDefaultText call ProcessText ret -; 0xb592 ; handles player choice in what deck to save ; in the Deck Save Machine @@ -9107,7 +8974,6 @@ SaveDeckInDeckSaveMachine: ; b592 (2:7592) call DrawWideTextBox_WaitForInput scf ret -; 0xb609 DeckMachineMenuParameters: ; b609 (2:7609) db 1, 2 ; cursor x, cursor y @@ -9116,7 +8982,6 @@ DeckMachineMenuParameters: ; b609 (2:7609) db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; 0xb611 ; outputs in de pointer of saved deck ; corresponding to index in wSelectedDeckMachineEntry @@ -9135,7 +9000,6 @@ GetSelectedSavedDeckPtr: ; b611 (2:7611) pop hl pop af ret -; 0xb625 ; checks if it's possible to build saved deck with index b ; includes cards from already built decks from flags in a @@ -9160,7 +9024,6 @@ CheckIfCanBuildSavedDeck: ; b625 (2:7625) add hl, bc call CheckIfHasEnoughCardsToBuildDeck ret -; 0xb644 ; switches to SRAM bank 0 and stores current SRAM bank in wTempBankSRAM ; skips if current SRAM bank is already 0 @@ -9175,7 +9038,6 @@ SafelySwitchToSRAM0: ; b644 (2:7644) .skip pop af ret -; 0xb653 ; switches to SRAM bank 1 and stores current SRAM bank in wTempBankSRAM ; skips if current SRAM bank is already 1 @@ -9190,7 +9052,6 @@ SafelySwitchToSRAM1: ; b653 (2:7653) .skip pop af ret -; 0xb664 SafelySwitchToTempSRAMBank: ; b664 (2:7664) push af @@ -9205,7 +9066,6 @@ SafelySwitchToTempSRAMBank: ; b664 (2:7664) pop bc pop af ret -; 0xb675 ; returns carry if wTempCardCollection does not ; have enough cards to build deck pointed by hl @@ -9244,7 +9104,6 @@ CheckIfHasEnoughCardsToBuildDeck: ; b675 (2:7675) call DisableSRAM or a ret -; 0xb6a1 ; outputs in a the first slot that is empty to build a deck ; if no empty slot is found, return carry @@ -9283,7 +9142,6 @@ FindFirstEmptyDeckSlot: ; b6a1 (2:76a1) .set_carry scf ret -; 0xb6ca ; prompts the player whether to delete selected saved deck ; if player selects yes, clears memory in SRAM @@ -9315,7 +9173,6 @@ TryDeleteSavedDeck: ; b6ca (2:76ca) ld a, [wCardListCursorPos] scf ret -; 0xb6fb DeckMachineSelectionParams: ; b6fb (2:76fb) db 1 ; x pos @@ -9357,7 +9214,6 @@ DrawListScrollArrows: ; b704 (2:7704) lb bc, 19, 11 call WriteByteToBGMap0 ret -; 0xb738 ; handles the deck menu for when the player ; needs to make space for new deck to build @@ -9428,7 +9284,6 @@ HandleDismantleDeckToMakeSpace: ; b738 (2:7738) call DrawWideTextBox_WaitForInput ld a, [wCurDeck] ret -; 0xb7c6 ; tries to build the deck in wSelectedDeckMachineEntry ; will check if can be built with or without dismantling @@ -9743,7 +9598,6 @@ TryBuildDeckMachineDeck: ; b7c6 (2:77c6) ld e, a pop af ret -; 0xb991 PrinterMenu_DeckConfiguration: ; b991 (2:7991) xor a @@ -9797,7 +9651,6 @@ PrinterMenu_DeckConfiguration: ; b991 (2:7991) ld a, [wTempDeckMachineCursorPos] ld [wCardListCursorPos], a jp .asm_b99e -; 0xba04 HandleAutoDeckMenu: ; ba04 (2:7a04) ld a, [wCurAutoDeckMachine] @@ -10080,7 +9933,6 @@ HandleAutoDeckMenu: ; ba04 (2:7a04) dec a jr nz, .loop ret -; 0xbc04 Func_bc04: ; bc04 (2:7c04) xor a @@ -10142,7 +9994,6 @@ Func_bc04: ; bc04 (2:7c04) call DisableSRAM or a ret -; 0xbc7a Func_bc7a: ; bc7a (2:7c7a) xor a @@ -10223,4 +10074,3 @@ Func_bc7a: ; bc7a (2:7c7a) call DisableSRAM xor a ret -; 0xbd2e diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 05c7b91..d466620 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -9408,4 +9408,3 @@ NPCMovement_fce1: ; fce1 (3:7ce1) NPCMovement_fce3: ; fce3 (3:7ce3) db NORTH | NO_MOVE db $ff -; 0xfce5 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 386f8b5..d834512 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -1182,11 +1182,11 @@ _PCMenu_ReadMail: ; 1076d (4:476d) pop af ld [wd291], a ret -; 0x107c2 ; unreferenced? - db $01, $00, $00, $4A, $21, $B5, $42, $E0 - db $03, $4A, $29, $94, $52, $FF, $7F, $00 +Unknown_107c2: ; 107c2 (4:47c2) + db $01, $00, $00, $4a, $21, $b5, $42, $e0 + db $03, $4a, $29, $94, $52, $fF, $7f, $00 Unknown_107d2: ; 107d2 (4:47d2) db 1, 0 @@ -1243,21 +1243,21 @@ PCMailHandleDPadInput: ; 107df (4:47df) PCMailTransitionTable: ; 10825 (4:4825) ; up, right, down, left - db $0C, $01, $03, $02 ; mail 1 - db $0D, $02, $04, $00 ; mail 2 - db $0E, $00, $05, $01 ; mail 3 + db $0c, $01, $03, $02 ; mail 1 + db $0d, $02, $04, $00 ; mail 2 + db $0e, $00, $05, $01 ; mail 3 db $00, $04, $06, $05 ; mail 4 db $01, $05, $07, $03 ; mail 5 db $02, $03, $08, $04 ; mail 6 db $03, $07, $09, $08 ; mail 7 - db $04, $08, $0A, $06 ; mail 8 - db $05, $06, $0B, $07 ; mail 9 - db $06, $0A, $0C, $0B ; mail 10 - db $07, $0B, $0D, $09 ; mail 11 - db $08, $09, $0E, $0A ; mail 12 - db $09, $0D, $00, $0E ; mail 13 - db $0A, $0E, $01, $0C ; mail 14 - db $0B, $0C, $02, $0D ; mail 15 + db $04, $08, $0a, $06 ; mail 8 + db $05, $06, $0b, $07 ; mail 9 + db $06, $0a, $0c, $0b ; mail 10 + db $07, $0b, $0d, $09 ; mail 11 + db $08, $09, $0e, $0a ; mail 12 + db $09, $0d, $00, $0e ; mail 13 + db $0a, $0e, $01, $0c ; mail 14 + db $0b, $0c, $02, $0d ; mail 15 PCMailHandleAInput: ; 10861 (4:4861) ldh a, [hKeysPressed] @@ -1667,7 +1667,6 @@ Func_10a9b: ; 10a9b (4:4a9b) db $00 ; CONSOLE_DMG db $00 ; CONSOLE_SGB db $00 ; CONSOLE_CGB -; 0x10ab4 Func_10ab4: ; 10ab4 (4:4ab4) ld a, [wLCDC] @@ -1697,7 +1696,6 @@ Func_10ab4: ; 10ab4 (4:4ab4) call FillMemoryWithDE call FlushAllPalettes ret -; 0x10af9 Func_10af9: ; 10af9 (4:4af9) call BackupPalsAndSetWhite @@ -1705,7 +1703,6 @@ Func_10af9: ; 10af9 (4:4af9) call FlushAllPalettes call EnableLCD jp FadeScreenToTempPals -; 0x10b08 BackupPalsAndSetWhite: ; 10b08 (4:4b08) ld a, [wBGP] @@ -1731,7 +1728,6 @@ Func_10b28: ; 10b28 (4:4b28) ld bc, NUM_BACKGROUND_PALETTES palettes call FillMemoryWithDE ret -; 0x10b41 ; gets from backup OB pals the first color ; of each pal and writes them in wObjectPalettesCGB @@ -1758,7 +1754,6 @@ RestoreFirstColorInOBPals: ; 10b41 (4:4b41) dec c jr nz, .loop_pals ret -; 0x10b5e FadeScreenToTempPals: ; 10b5e (4:4b5e) ld a, [wVBlankCounter] @@ -1783,7 +1778,6 @@ FadeScreenToTempPals: ; 10b5e (4:4b5e) ld a, [wVBlankCounter] sub b ret -; 0x10b85 ; does something with wBGP given wd294 ; mixes them into a single value? @@ -1870,7 +1864,6 @@ Func_10b85: ; 10b85 (4:4b85) db %10 ; b = %11 | c = %01 db %10 ; b = %11 | c = %10 db %11 ; b = %11 | c = %11 -; 0x10be1 FadeOBPalIntoTemp: ; 10be1 (4:4be1) push bc @@ -1878,7 +1871,6 @@ FadeOBPalIntoTemp: ; 10be1 (4:4be1) ld hl, wObjectPalettesCGB ld de, wTempObjectPalettesCGB jr FadePalIntoAnother -; 0x10bec FadeBGPalIntoTemp1: ; 10bec (4:4bec) push bc @@ -2039,7 +2031,6 @@ FadePalIntoAnother: ; 10c0b (4:4c0b) ret z inc a ret -; 0x10c96 Func_10c96: ; 10c96 (4:4c96) ldh a, [hBankSRAM] @@ -2093,7 +2084,6 @@ CopyPalsToSRAMBuffer: ; 10cbb (4:4cbb) call BankswitchSRAM call DisableSRAM ret -; 0x10cea ; loads BG and OP pals, ; wBackgroundPalettesCGB and wObjectPalettesCGB @@ -2123,7 +2113,6 @@ LoadPalsFromSRAMBuffer: ; 10cea (4:4cea) call BankswitchSRAM call DisableSRAM ret -; 0x10d17 ; backs up all palettes ; and writes 4 BG pals with white pal @@ -2150,7 +2139,6 @@ Func_10d17: ; 10d17 (4:4d17) ld a, $10 ld [wd317], a ret -; 0x10d50 Func_10d50: ; 10d50 (4:4d50) ld a, [wd293] @@ -2166,7 +2154,6 @@ Func_10d50: ; 10d50 (4:4d50) ld a, $10 ld [wd317], a ret -; 0x10d74 ; does stuff according to bottom 2 bits from wd317: ; - if equal to %01, modify wBGP @@ -2193,7 +2180,6 @@ Func_10d74: ; 10d74 (4:4d74) dec a ld [wd317], a ret -; 0x10d98 Unknown_10d98: ; 10d98 (4:4d98) db 12, 0 ; start menu coords @@ -2515,17 +2501,17 @@ OverworldMap_GetMapPosition: ; 10efd (4:4efd) OverworldMap_MapPositions: ; 10f14 (4:4f14) db $00, $00 ; unused - db $0C, $68 ; OWMAP_MASON_LABORATORY + db $0c, $68 ; OWMAP_MASON_LABORATORY db $04, $18 ; OWMAP_ISHIHARAS_HOUSE db $34, $68 ; OWMAP_FIGHTING_CLUB db $14, $38 ; OWMAP_ROCK_CLUB - db $6C, $64 ; OWMAP_WATER_CLUB + db $6c, $64 ; OWMAP_WATER_CLUB db $24, $50 ; OWMAP_LIGHTNING_CLUB - db $7C, $40 ; OWMAP_GRASS_CLUB - db $5C, $2C ; OWMAP_PSYCHIC_CLUB - db $7C, $20 ; OWMAP_SCIENCE_CLUB - db $6C, $10 ; OWMAP_FIRE_CLUB - db $3C, $20 ; OWMAP_CHALLENGE_HALL + db $7c, $40 ; OWMAP_GRASS_CLUB + db $5c, $2c ; OWMAP_PSYCHIC_CLUB + db $7c, $20 ; OWMAP_SCIENCE_CLUB + db $6c, $10 ; OWMAP_FIRE_CLUB + db $3c, $20 ; OWMAP_CHALLENGE_HALL db $44, $44 ; OWMAP_POKEMON_DOME OverworldMap_PrintMapName: ; 10f2e (4:4f2e) @@ -2998,7 +2984,6 @@ Func_111b3: ; 111b3 (4:51b3) pop hl inc hl jr .loop_text_print_2 -; 0x111e9 InitAndPrintPauseMenu: ; 111e9 (4:51e9) push hl @@ -3026,7 +3011,6 @@ InitAndPrintPauseMenu: ; 111e9 (4:51e9) pop bc pop hl ret -; 0x1120f ; xors sb800 ; this has the effect of invalidating the save data checksum @@ -3053,7 +3037,6 @@ InvalidateSaveData: ; 1120f (4:520f) call DisableSRAM pop hl ret -; 0x11238 ; saves all data to SRAM, including ; General save data and Album/Deck data @@ -3068,7 +3051,6 @@ SaveAndBackupData: ; 11238 (4:5238) call WriteBackupCardAndDeckSaveData pop de ret -; 0x1124d _SaveGeneralSaveData: ; 1124d (4:524d) push de @@ -3079,7 +3061,6 @@ _SaveGeneralSaveData: ; 1124d (4:524d) call UpdateAlbumProgress pop de ret -; 0x1125f ; de = pointer to general game data in SRAM SaveGeneralSaveDataFromDE: ; 1125f (4:525f) @@ -3099,7 +3080,6 @@ SaveGeneralSaveDataFromDE: ; 1125f (4:525f) pop bc pop hl ret -; 0x1127f ; writes in de total num of cards collected ; and in (de + 1) total num of cards to collect @@ -3121,7 +3101,6 @@ UpdateAlbumProgress: ; 1127f (4:527f) pop de pop hl ret -; 0x11299 ; save values that are listed in WRAMToSRAMMapper ; from WRAM to SRAM, and calculate its checksum @@ -3212,7 +3191,6 @@ CopyGeneralSaveDataToSRAM: ; 11299 (4:5299) ld [wTempPointer + 1], a pop hl ret -; 0x11320 ; returns carry if no error ; is found in sBackupGeneralSaveData @@ -3233,7 +3211,6 @@ ValidateBackupGeneralSaveData: ; 11320 (4:5320) ld a, [wNumSRAMValidationErrors] cp 1 ret -; 0x11343 ; returns carry if no error ; is found in sGeneralSaveData @@ -3249,7 +3226,6 @@ _ValidateGeneralSaveData: ; 11343 (4:5343) ld a, [wNumSRAMValidationErrors] cp 1 ret -; 0x1135d ; validates the general game data saved in SRAM ; de = pointer to general game data in SRAM @@ -3380,7 +3356,6 @@ ValidateGeneralSaveDataFromDE: ; 1135d (4:535d) pop bc pop hl ret -; 0x1140a LoadAlbumProgressFromSRAM: ; 1140a (4:540a) push de @@ -3391,7 +3366,6 @@ LoadAlbumProgressFromSRAM: ; 1140a (4:540a) ld [wTotalNumCardsToCollect], a pop de ret -; 0x11416 ; first copies data from backup SRAM to main SRAM ; then loads it to WRAM from main SRAM @@ -3408,7 +3382,6 @@ LoadBackupSaveData: ; 11416 (4:5416) pop de pop hl ret -; 0x11430 _LoadGeneralSaveData: ; 11430 (4:5430) push de @@ -3416,7 +3389,6 @@ _LoadGeneralSaveData: ; 11430 (4:5430) call LoadGeneralSaveDataFromDE pop de ret -; 0x11439 ; de = pointer to save data LoadGeneralSaveDataFromDE: ; 11439 (4:5439) @@ -3488,7 +3460,6 @@ LoadGeneralSaveDataFromDE: ; 11439 (4:5439) pop bc pop hl ret -; 0x11498 wram_sram_map: MACRO dw \1 ; WRAM address @@ -3539,12 +3510,10 @@ WRAMToSRAMMapper: ; 11498 (4:5498) wram_sram_map .EmptySRAMSlot, 16, $00, $ff ; sb86b wram_sram_map wEventVars, 64, $00, $ff ; sEventVars dw NULL -; 0x1156c ; fills an empty SRAM slot with zero .EmptySRAMSlot: ; 1156c (4:556c) db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 -; 0x1157c ; save the game ; if c is 0, save the player at their current position @@ -3599,7 +3568,6 @@ _AddCardToCollectionAndUpdateAlbumProgress: ; 115a3 (4:55a3) pop bc pop hl ret -; 0x115d4 WriteBackupCardAndDeckSaveData: ; 115d4 (4:55d4) ld bc, sCardAndDeckSaveDataEnd - sCardAndDeckSaveData @@ -3633,7 +3601,6 @@ WriteDataToBackup: ; 115e2 (4:55e2) call BankswitchSRAM call DisableSRAM ret -; 0x115ff LoadBackupCardAndDeckSaveData: ; 115ff (4:55ff) ld bc, sCardAndDeckSaveDataEnd - sCardAndDeckSaveData @@ -3668,7 +3635,6 @@ LoadDataFromBackup: ; 1160d (4:560d) call BankswitchSRAM call DisableSRAM ret -; 0x1162a INCLUDE "data/map_scripts.asm" @@ -3832,7 +3798,6 @@ _GetNPCDuelConfigurations: ; 11f4e (4:5f4e) pop bc pop hl ret -; 0x11f7d _GetChallengeMachineDuelConfigurations: ; 11f7d (4:5f7d) push bc @@ -3868,7 +3833,6 @@ _GetChallengeMachineDuelConfigurations: ; 11f7d (4:5f7d) pop de pop bc ret -; 0x11fae DeckIDDuelConfigurations: ; 11fae (4:5fae) db SAMS_PRACTICE_DECK_ID ; deck ID @@ -4383,9 +4347,9 @@ MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck: ; 12264 (4:6264) dw NULL ; function pointer if non-0 SamNormalMultichoice_ConfigurationTable: ; 1227d (4:627d) - db $0A, $00 ; x, y to start drawing box - db $0A, $0A ; width, height of box - db $0C, $02 ; x, y coordinate to start printing next text + db $0a, $00 ; x, y to start drawing box + db $0a, $0a ; width, height of box + db $0c, $02 ; x, y coordinate to start printing next text tx Text03ff ; text id to print next db $ff ; marker byte -- end text entries db $0b, $02 ; cursor starting x, y @@ -4397,7 +4361,7 @@ SamNormalMultichoice_ConfigurationTable: ; 1227d (4:627d) SamRulesMultichoice_ConfigurationTable: ; 1228e (4:628e) db $06, $00 ; x, y to start drawing box - db $0E, $12 ; width, height of box + db $0e, $12 ; width, height of box db $08, $02 ; x coordinate to start printing text tx Text0400 ; text id to print next db $ff ; marker byte -- end text entries @@ -5391,7 +5355,6 @@ Func_1288c: ; 1288c (4:688c) pop bc pop hl ret -; 0x128a9 DisplayPlayerNamingScreen:: ; 128a9 (4:68a9) ; clear the name buffer. @@ -5576,7 +5539,6 @@ Func_1296e: ; 1296e (4:696e) pop hl pop bc ret -; 0x1299f ; creates a new entry in SpriteAnimBuffer, else loads the sprite if need be CreateSpriteAndAnimBufferEntry: ; 1299f (4:699f) @@ -5668,7 +5630,6 @@ DisableSpriteAnim: ; 129fd (4:69fd) pop bc pop hl ret -; 0x12a13 GetSpriteAnimCounter: ; 12a13 (4:6a13) ld a, [wWhichSprite] @@ -5680,7 +5641,6 @@ GetSpriteAnimCounter: ; 12a13 (4:6a13) pop bc pop hl ret -; 0x12a21 _HandleAllSpriteAnimations: ; 12a21 (4:6a21) push af @@ -5804,7 +5764,6 @@ StartSpriteAnimation: ; 12ac0 (4:6ac0) call HandleAnimationFrame pop hl ret -; 0x12ac9 ; a = sprite animation ; c = animation counter value @@ -5827,7 +5786,6 @@ Func_12ac9: ; 12ac9 (4:6ac9) call SetAnimationCounterAndLoop pop hl ret -; 0x12ae2 ; Given an animation ID, fills the current sprite's Animation Pointer and Frame Offset Pointer ; a - Animation ID for current sprite @@ -6038,7 +5996,6 @@ Func_12bf3: ; 12bf3 (4:6bf3) pop bc pop hl ret -; 0x12c05 ; gets some value based on the sprite in a and wSpriteVRAMBuffer ; loads the sprites data if it doesn't already exist @@ -6924,20 +6881,20 @@ BoosterLogoOAM: ; 13132 (4:7132) db $08, $38, $17, $00 db $10, $00, $08, $00 db $10, $08, $09, $00 - db $10, $10, $0A, $00 - db $10, $18, $0B, $00 - db $10, $20, $0C, $00 - db $10, $28, $0D, $00 - db $10, $30, $0E, $00 - db $10, $38, $0F, $00 + db $10, $10, $0a, $00 + db $10, $18, $0b, $00 + db $10, $20, $0c, $00 + db $10, $28, $0d, $00 + db $10, $30, $0e, $00 + db $10, $38, $0f, $00 db $18, $00, $18, $00 db $18, $08, $19, $00 - db $18, $10, $1A, $00 - db $18, $18, $1B, $00 - db $18, $20, $1C, $00 - db $18, $28, $1D, $00 - db $18, $30, $1E, $00 - db $18, $38, $1F, $00 + db $18, $10, $1a, $00 + db $18, $18, $1b, $00 + db $18, $20, $1c, $00 + db $18, $28, $1d, $00 + db $18, $30, $1e, $00 + db $18, $38, $1f, $00 Func_131b3: ; 131b3 (4:71b3) call ChallengeMachine_Initialize diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm index 6927121..75ca6b9 100644 --- a/src/engine/bank05.asm +++ b/src/engine/bank05.asm @@ -575,7 +575,6 @@ ConvertColorToEnergyCardID: ; 1430f (5:430f) db FIGHTING_ENERGY db PSYCHIC_ENERGY db DOUBLE_COLORLESS_ENERGY -; 0x14323 ; returns carry if loaded attack effect has ; an "initial effect 2" or "require selection" command type @@ -598,7 +597,6 @@ Func_14323: ; 14323 (5:4323) .set_carry scf ret -; 0x1433d ; return carry depending on card index in a: ; - if energy card, return carry if no energy card has been played yet @@ -1853,7 +1851,6 @@ Func_1585b: ; 1585b (5:585b) ld a, e scf ret -; 0x15886 ; expects a $00-terminated list of 3-byte data with the following: ; - non-zero value @@ -1897,7 +1894,6 @@ Func_15886: ; 15886 (5:5886) pop hl inc hl jr .loop_energy_cards -; 0x158b2 ; determine AI score for retreating ; return carry if AI decides to retreat @@ -4049,7 +4045,6 @@ Func_16488: ; 16488 (5:6488) ld a, [wAIScore] ld [de], a jr AIProcessAndTryToPlayEnergy.has_logic_flags -; 0x164a1 ; have AI choose an energy card to play, but do not play it. ; does not consider whether the cards have evolutions to be played. diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 4eafcb7..811c36e 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -465,10 +465,10 @@ OpenInPlayAreaScreen_TextTable: tx AttackText ; INPLAYAREA_PLAYER_BENCH_3 tx PKMNPowerText ; INPLAYAREA_PLAYER_BENCH_4 tx DoneText ; INPLAYAREA_PLAYER_BENCH_5 - dw NONE ; INPLAYAREA_PLAYER_ACTIVE + dw NULL ; INPLAYAREA_PLAYER_ACTIVE tx DuelistHandText_2 ; INPLAYAREA_PLAYER_HAND tx DuelistDiscardPileText ; INPLAYAREA_PLAYER_DISCARD_PILE - dw NONE ; INPLAYAREA_OPP_ACTIVE + dw NULL ; INPLAYAREA_OPP_ACTIVE tx DuelistHandText_2 ; INPLAYAREA_OPP_HAND tx DuelistDiscardPileText ; INPLAYAREA_OPP_DISCARD_PILE tx HandText ; INPLAYAREA_OPP_BENCH_1 @@ -1283,7 +1283,7 @@ SetDuelAnimationScreen: ; 1909d (6:509d) ld h, PLAYER_TURN ld a, DUEL_ANIM_SCREEN_OPP_PLAY_AREA -.ok: +.ok ld [wDuelAnimationScreen], a ret @@ -1435,7 +1435,6 @@ Func_19674: ; 19674 (6:5674) jr nz, .loop_delay_3 nop ret -; 0x19692 ; input a = byte to transmit through IR TransmitByteThroughIR: ; 19692 (6:5692) @@ -1472,7 +1471,6 @@ ReceiveByteThroughIR_ZeroIfUnsuccessful: ; 196ba (6:56ba) ret nc xor a ret -; 0x196c0 ; returns carry if there's some time out ; and output in register a of $ff @@ -1543,14 +1541,12 @@ ReceiveByteThroughIR: ; 196c0 (6:56c0) pop de or a ret -; 0x19700 ReturnZFlagUnsetAndCarryFlagSet: ; 19700 (6:5700) ld a, $ff or a ; z not set scf ; carry set ret -; 0x19705 ; called when expecting to transmit data Func_19705: ; 19705 (6:5705) @@ -1568,7 +1564,6 @@ Func_19705: ; 19705 (6:5705) jr nz, .asm_19708 xor a ret -; 0x1971e ; called when expecting to receive data Func_1971e: ; 1971e (6:571e) @@ -1584,11 +1579,9 @@ Func_1971e: ; 1971e (6:571e) call TransmitByteThroughIR xor a ret -; 0x19735 ReturnZFlagUnsetAndCarryFlagSet2: ; 19735 (6:5735) jp ReturnZFlagUnsetAndCarryFlagSet -; 0x19738 TransmitIRDataBuffer: ; 19738 (6:5738) call Func_19705 @@ -1651,7 +1644,6 @@ ReceiveNBytesToHLThroughIR: ; 1977d (6:577d) or a jr nz, ReturnZFlagUnsetAndCarryFlagSet2 ret -; 0x19792 ; disables interrupts, and sets joypad and IR communication port ; switches to CGB normal speed @@ -1663,7 +1655,6 @@ StartIRCommunications: ; 19792 (6:5792) ld a, $c0 ldh [rRP], a ret -; 0x1979f ; reenables interrupts, and switches CGB back to double speed CloseIRCommunications: ; 1979f (6:579f) @@ -1682,14 +1673,12 @@ CloseIRCommunications: ; 1979f (6:579f) call SwitchToCGBDoubleSpeed ei ret -; 0x197b8 ; set rRP to 0 ClearRP: ; 197b8 (6:57b8) ld a, $00 ldh [rRP], a ret -; 0x197bd ; expects to receive a command (IRCMD_* constant) ; in wIRDataBuffer + 1, then calls the subroutine @@ -1776,7 +1765,6 @@ ExecuteReceivedIRCommands: ; 197bd (6:57bd) call .jp_hl call StoreRegistersInIRDataBuffer ret -; 0x1981d ; returns carry set if request sent was not acknowledged TrySendIRRequest: ; 1981d (6:581d) @@ -1805,7 +1793,6 @@ TrySendIRRequest: ; 1981d (6:581d) call CloseIRCommunications pop af ret -; 0x19842 ; returns carry set if request was not received TryReceiveIRRequest: ; 19842 (6:5842) @@ -1831,7 +1818,6 @@ TryReceiveIRRequest: ; 19842 (6:5842) call CloseIRCommunications pop af ret -; 0x19865 ; sends request for other device to close current communication RequestCloseIRCommunication: ; 19865 (6:5865) @@ -1847,7 +1833,6 @@ SafelyCloseIRCommunications: ; 19870 (6:5870) call CloseIRCommunications pop af ret -; 0x19876 ; sends a request for data to be transmitted ; from the other device @@ -1865,7 +1850,6 @@ RequestDataTransmissionThroughIR: ; 19876 (6:5876) jr c, SafelyCloseIRCommunications call ReceiveNBytesToHLThroughIR jr SafelyCloseIRCommunications -; 0x19889 ; transmits data to be written in the other device ; hl = start of data to transmit @@ -1885,7 +1869,6 @@ RequestDataReceivalThroughIR: ; 19889 (6:5889) .asm_1989e call ReturnZFlagUnsetAndCarryFlagSet jr SafelyCloseIRCommunications -; 0x198a3 ; first stores all the current registers in wIRDataBuffer ; then transmits it through IR @@ -1903,7 +1886,6 @@ TransmitRegistersThroughIR: ; 198a3 (6:58a3) inc sp inc sp jr SafelyCloseIRCommunications -; 0x198b7 ; stores af, hl, de and bc in wIRDataBuffer StoreRegistersInIRDataBuffer: ; 198b7 (6:58b7) @@ -1930,7 +1912,6 @@ StoreRegistersInIRDataBuffer: ; 198b7 (6:58b7) inc hl ld [hl], b ; <- b ret -; 0x198d0 ; loads all the registers that were stored ; from StoreRegistersInIRDataBuffer @@ -1956,7 +1937,6 @@ LoadRegistersFromIRDataBuffer: ; 198d0 (6:58d0) pop hl pop af ret -; 0x198e7 ; empties screen and replaces ; wVBlankFunctionTrampoline with HandleAllSpriteAnimations @@ -1975,7 +1955,6 @@ Func_198e7: ; 198e7 (6:58e7) ld [hl], HIGH(HandleAllSpriteAnimations) ei ret -; 0x19907 ; sets backup VBlank function as wVBlankFunctionTrampoline RestoreVBlankFunction: ; 19907 (6:5907) @@ -1985,7 +1964,6 @@ RestoreVBlankFunction: ; 19907 (6:5907) call Func_3ca4 bank1call ZeroObjectPositionsAndToggleOAMCopy ret -; 0x19917 ; copies 2 bytes from hl to de while interrupts are disabled ; used to load or store wVBlankFunctionTrampoline @@ -1999,7 +1977,6 @@ BackupVBlankFunctionTrampoline: ; 19917 (6:5917) ld [de], a ei ret -; 0x1991f Func_1991f: ; 1991f (6:591f) add a @@ -2156,7 +2133,6 @@ Func_19a12: ; 19a12 (6:5a12) ld de, wDefaultText call CopyText ret -; 0x19a1f ; hl = text ID LoadLinkConnectingScene: ; 19a1f (6:5a1f) @@ -2169,7 +2145,6 @@ LoadLinkConnectingScene: ; 19a1f (6:5a1f) call DrawWideTextBox_PrintText call EnableLCD ret -; 0x19a33 ; shows Link Not Connected scene ; then asks the player whether they want to try again @@ -2195,7 +2170,6 @@ ClearRPAndRestoreVBlankFunction: ; 19a4c (6:5a4c) call RestoreVBlankFunction pop af ret -; 0x19a55 ; prepares IR communication parameter data ; a = a IRPARAM_* constant for the function of this connection @@ -2232,7 +2206,6 @@ InitIRCommunications: ; 19a55 (6:5a55) jr nz, .loop call DisableSRAM ret -; 0x19a89 ; returns carry if communication was unsuccessful ; if a = 0, then it was a communication error @@ -2272,7 +2245,6 @@ PrepareSendCardOrDeckConfigurationThroughIR: ; 19a89 (6:5a89) jr nz, SetIRCommunicationErrorCode_Error or a ret -; 0x19ab7 ; exchanges player names and IR communication parameters ; checks whether parameters for communication match @@ -2316,7 +2288,6 @@ ExchangeIRCommunicationParameters: ; 19ab7 (6:5ab7) xor a scf ret -; 0x19af9 SetIRCommunicationErrorCode_Error: ; 19af9 (6:5af9) ld hl, wIRCommunicationErrorCode @@ -2328,7 +2299,6 @@ SetIRCommunicationErrorCode_Error: ; 19af9 (6:5af9) ld a, $01 scf ret -; 0x19b0d SetIRCommunicationErrorCode_NoError: ; 19b0d (6:5b0d) ld hl, wOwnIRCommunicationParams @@ -2340,7 +2310,6 @@ SetIRCommunicationErrorCode_NoError: ; 19b0d (6:5b0d) call RequestCloseIRCommunication or a ret -; 0x19b20 ; makes device receptive to receive data from other device ; to write in wDuelTempList (either list of cards or a deck configuration) @@ -2368,7 +2337,6 @@ TryReceiveCardOrDeckConfigurationThroughIR: ; 19b20 (6:5b20) ld a, $01 scf ret -; 0x19b41 ; returns carry if card(s) wasn't successfully sent _SendCard: ; 19b41 (6:5b41) @@ -2408,12 +2376,10 @@ _SendCard: ; 19b41 (6:5b41) ; failed scf ret -; 0x19b87 PlayCardPopSong: ; 19b87 (6:5b87) ld a, MUSIC_CARD_POP jp PlaySong -; 0x19b8c _ReceiveCard: ; 19b8c (6:5b8c) call StopMusic @@ -2443,7 +2409,6 @@ _ReceiveCard: ; 19b8c (6:5b8c) jr nc, _ReceiveCard scf ret -; 0x19bc5 _SendDeckConfiguration: ; 19bc5 (6:5bc5) call StopMusic @@ -2472,7 +2437,6 @@ _SendDeckConfiguration: ; 19bc5 (6:5bc5) jr nc, _SendDeckConfiguration scf ret -; 0x19bfb _ReceiveDeckConfiguration: ; 19bfb (6:5bfb) call StopMusic @@ -2493,7 +2457,6 @@ _ReceiveDeckConfiguration: ; 19bfb (6:5bfb) jr nc, _ReceiveDeckConfiguration ; loop back and try again scf ret -; 0x19c20 _DoCardPop: ; 19c20 (6:5c20) ; loads scene for Card Pop! screen @@ -2569,7 +2532,6 @@ _DoCardPop: ; 19c20 (6:5c20) call PrintScrollableText_NoTextBoxLabel call RestoreVBlankFunction ret -; 0x19cb2 ; handles all communications to the other device to do Card Pop! ; returns carry if Card Pop! is unsuccessful @@ -2665,7 +2627,6 @@ HandleCardPopCommunications: ; 19cb2 (6:5cb2) ldtx hl, ThePopWasntSuccessfulText scf ret -; 0x19d49 ; looks up the name in wNameBuffer in wCardPopNameList ; used to know whether this save file has done Card Pop! @@ -2732,7 +2693,6 @@ LookUpNameInCardPopNameList: ; 19d49 (6:5d49) .not_same scf ret -; 0x19d92 ; loads in wLoadedCard1 a random card to be received ; this selection is done based on the rarity that is @@ -2823,7 +2783,6 @@ DecideCardToReceiveFromCardPop: ; 19d92 (6:5d92) jr z, .got_card_id ld e, MEW2 jr .got_card_id -; 0x19df7 ; lists in wCardPopCardCandidates all cards that: ; - are Pokemon cards; @@ -2876,7 +2835,6 @@ CreateCardPopCandidateList: ; 19df7 (6:5df7) pop de pop hl ret -; 0x19e32 ; creates a unique two-byte hash from the name given in hl ; the low byte is calculated by simply adding up all characters @@ -2899,7 +2857,6 @@ CalculateNameHash: ; 19e32 (6:5e32) dec c jr nz, .loop ret -; 0x19e42 ; sends serial data to printer ; if there's an error in connection, @@ -2981,7 +2938,6 @@ ShowPrinterConnectionErrorScene: ; 19e99 (6:5e99) call RestoreVBlankFunction scf ret -; 0x19eb4 ; main card printer function Func_19eb4: ; 19eb4 (6:5eb4) @@ -3017,7 +2973,6 @@ Func_19eb4: ; 19eb4 (6:5eb4) call RestoreVBlankFunction call ResetPrinterCommunicationSettings jp HandlePrinterError -; 0x19f05 DrawCardPicInSRAMGfxBuffer2: ; 19f05 (6:5f05) ld hl, wLoadedCard1Gfx @@ -3033,7 +2988,6 @@ DrawCardPicInSRAMGfxBuffer2: ; 19f05 (6:5f05) lb bc, 16, 12 call FillRectangle ret -; 0x19f20 ; writes the tiles necessary to draw ; the card's information in sGfxBuffer0 @@ -3090,7 +3044,6 @@ DrawTopCardInfoInSRAMGfxBuffer0: ; 19f20 (6:5f20) bank1call WriteTwoByteNumberInTxSymbolFormat .skip_pokemon_data ret -; 0x19f87 Func_19f87: ; 19f87 (6:5f87) call TryInitPrinterCommunications @@ -3101,7 +3054,6 @@ Func_19f87: ; 19f87 (6:5f87) call Func_1a0cc call Func_1a111 ret -; 0x19f99 Func_19f99: ; 19f99 (6:5f99) call TryInitPrinterCommunications @@ -3115,7 +3067,6 @@ Func_19f99: ; 19f99 (6:5f99) jr nz, .asm_19fa2 call Func_1a111 ret -; 0x19fad ; writes the tiles necessary to draw ; the card's information in sGfxBuffer0 @@ -3163,14 +3114,12 @@ DrawBottomCardInfoInSRAMGfxBuffer0: ; 19fad (6:5fad) call ProcessTextFromPointerToID bank1call SetOneLineSeparation ret -; 0x1a004 RetreatWeakResistData: ; 1a004 (6:6004) textitem 1, 70, RetreatText textitem 1, 71, WeaknessText textitem 1, 72, ResistanceText db $ff -; 0x1a011 Func_1a011: ; 1a011 (6:6011) call TryInitPrinterCommunications @@ -3184,7 +3133,6 @@ Func_1a011: ; 1a011 (6:6011) jr nz, .asm_1a01a call Func_1a108 ret -; 0x1a025 ; calls setup text and sets wTilePatternSelector Func_1a025: ; 1a025 (6:6025) @@ -3195,7 +3143,6 @@ Func_1a025: ; 1a025 (6:6025) xor a ld [wTilePatternSelectorCorrection], a ret -; 0x1a035 ; switches to CGB normal speed, resets serial ; enables SRAM and switches to SRAM1 @@ -3229,7 +3176,6 @@ ClearPrinterGfxBuffer: ; 1a035 (6:6035) xor a ld [wce9f], a ret -; 0x1a06b ; reverts settings changed by PrepareForPrinterCommunications ResetPrinterCommunicationSettings: ; 1a06b (6:606b) @@ -3242,7 +3188,6 @@ ResetPrinterCommunicationSettings: ; 1a06b (6:606b) call SetupText pop af ret -; 0x1a080 ; unreferenced ; send some bytes through serial @@ -3250,7 +3195,6 @@ Func_1a080: ; 1a080 (6:6080) ld bc, $0 lb de, PRINTERPKT_NUL, $0 jp SendPrinterPacket -; 0x1a089 ; tries initiating the communications for ; sending data to printer @@ -3300,7 +3244,6 @@ TryInitPrinterCommunications: ; 1a089 (6:6089) dec c jr nz, .delay_loop jr .init -; 0x1a0cc ; loads tiles given by map in hl to sGfxBuffer5 ; copies first 20 tiles, then offsets by 2 tiles @@ -3355,7 +3298,6 @@ Func_1a0cc: ; 1a0cc (6:60cc) pop bc pop hl ret -; 0x1a108 Func_1a108: ; 1a108 (6:6108) call GetPrinterContrastSerialData @@ -3403,7 +3345,6 @@ GetPrinterContrastSerialData: ; 1a138 (6:6138) .contrast_level_data db $00, $20, $40, $60, $7f -; 0x1a14b ; unreferenced Func_1a14b: ; 1a14b (6:614b) @@ -3420,7 +3361,6 @@ Func_1a14b: ; 1a14b (6:614b) ld [wce9d], a scf ret -; 0x1a162 ; a = saved deck index to print _PrintDeckConfiguration: ; 1a162 (6:6162) @@ -3498,7 +3438,6 @@ _PrintDeckConfiguration: ; 1a162 (6:6162) call ResetPrinterCommunicationSettings call RestoreVBlankFunction jp HandlePrinterError -; 0x1a1ec SendCardListToPrinter: ; 1a1ec (6:61ec) ld a, [wPrinterHorizontalOffset] @@ -3589,7 +3528,6 @@ LoadCardInfoForPrinter: ; 1a235 (6:6235) bank1call WriteTwoDigitNumberInTxSymbolFormat pop hl ret -; 0x1a270 _PrintCardList: ; 1a270 (6:6270) ; if Select button is held when printing card list @@ -3870,7 +3808,6 @@ _PrintCardList: ; 1a270 (6:6270) ; Trainer db $dc ; icon tile tx TrainerCardText -; 0x1a420 ShowPrinterTransmitting: ; 1a420 (6:6420) call Func_198e7 @@ -3881,7 +3818,6 @@ ShowPrinterTransmitting: ; 1a420 (6:6420) call DrawWideTextBox_PrintText call EnableLCD ret -; 0x1a435 ; compresses $28 tiles in sGfxBuffer5 ; and writes it in sGfxBuffer5 + $28 tiles. @@ -3958,7 +3894,6 @@ CompressDataForPrinterSerialTransfer: ; 1a435 (6:6435) ld hl, sGfxBuffer5 + $28 tiles lb de, PRINTERPKT_DATA, $1 ret -; 0x1a485 ; checks whether the next byte sequence in hl, up to c bytes, can be compressed ; returns carry if the next sequence of bytes can be compressed, @@ -4049,7 +3984,6 @@ CheckDataCompression: ; 1a485 (6:6485) dec e dec e jr .no_carry -; 0x1a4cf ; sets up to start a link duel ; decides which device will pick the number of prizes @@ -4230,7 +4164,6 @@ _SetUpAndStartLinkDuel: ; 1a4cf (6:64cf) bit A_BUTTON_F, b jr z, .loop_input ret -; 0x1a61f Func_1a61f: ; 1a61f (6:661f) push af diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index b3601a9..5da744f 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -1,6 +1,5 @@ Func_1c000: ; 1c000 (7:4000) jp Set_WD_off -; 0x1c003 ; unreferenced debug function ; prints player's coordinates by pressing B @@ -49,7 +48,6 @@ Func_1c003: ; 1c003 (7:4003) .set_wd_on call Set_WD_on ret -; 0x1c056 Func_1c056: ; 1c056 (7:4056) push hl @@ -160,7 +158,6 @@ ClearNPCs: ; 1c440 (7:4440) pop bc pop hl ret -; 0x1c455 GetNPCDirection: ; 1c455 (7:4455) push hl @@ -402,7 +399,6 @@ UpdateNPCAnimation: ; 1c58e (7:458e) pop bc pop hl ret -; 0x1c5b9 ; if NPC's sprite has an animation, ; give it a random initial value @@ -439,7 +435,6 @@ ApplyRandomCountToNPCAnim: ; 1c5b9 (7:45b9) pop bc pop hl ret -; 0x1c5e9 ; sets the loaded NPC's direction ; to the direction that is in LOADED_NPC_DIRECTION_BACKUP @@ -457,7 +452,6 @@ Func_1c5e9: ; 1c5e9 (7:45e9) pop bc pop hl ret -; 0x1c5ff ; a = new direction SetNPCDirection: ; 1c5ff (7:45ff) @@ -471,7 +465,6 @@ SetNPCDirection: ; 1c5ff (7:45ff) call UpdateNPCAnimation pop hl ret -; 0x1c610 HandleAllNPCMovement: ; 1c610 (7:4610) push hl @@ -533,7 +526,6 @@ HandleAllNPCMovement: ; 1c610 (7:4610) pop bc pop hl ret -; 0x1c665 UpdateNPCSpritePosition: ; 1c665 (7:4665) push hl @@ -628,7 +620,6 @@ UpdateNPCSpritePosition: ; 1c665 (7:4665) ldh a, [hSCX] ld b, a ret -; 0x1c6d3 ; ands wIsAnNPCMoving with the current ; NPC's NPC_FLAG_MOVING_F @@ -643,7 +634,6 @@ UpdateIsAnNPCMovingFlag: ; 1c6d3 (7:46d3) pop bc pop hl ret -; 0x1c6e3 SetNPCsTilePermission: ; 1c6e3 (7:46e3) push hl @@ -684,7 +674,6 @@ SetAllNPCTilePermissions: ; 1c6f8 (7:46f8) pop bc pop hl ret -; 0x1c719 UpdateNPCsTilePermission: ; 1c719 (7:4719) push hl @@ -840,7 +829,6 @@ CheckIsAnNPCMoving: ; 1c7de (7:47de) ld a, [wIsAnNPCMoving] and NPC_FLAG_MOVING ret -; 0x1c7e4 ; while the NPC is moving, increment its movement step by 1 ; once it reaches a value greater than 16, update @@ -872,7 +860,6 @@ UpdateNPCMovementStep: ; 1c7e4 (7:47e4) pop bc pop hl ret -; 0x1c80d UpdateNPCPosition: ; 1c80d (7:480d) push hl @@ -900,7 +887,6 @@ UpdateNPCPosition: ; 1c80d (7:480d) pop bc pop hl ret -; 0x1c82e ClearMasterBeatenList: ; 1c82e (7:482e) push hl @@ -915,7 +901,6 @@ ClearMasterBeatenList: ; 1c82e (7:482e) pop bc pop hl ret -; 0x1c83d ; writes Master in register a to ; first empty slot in wMastersBeatenList @@ -996,7 +981,6 @@ Func_1c866: ; 1c866 (7:4866) ld a, c ldh [hSCY], a ret -; 0x1c890 ; unreferenced ; sets some flags on a given sprite @@ -1028,7 +1012,6 @@ Func_1c890: ; 1c890 (7:4890) set SPRITE_ANIM_FLAG_SPEED, [hl] .asm_1c8bb ret -; 0x1c8bc Func_1c8bc: ; 1c8bc (7:48bc) push hl @@ -1056,7 +1039,6 @@ Func_1c8bc: ; 1c8bc (7:48bc) pop bc pop hl ret -; 0x1c8ef PlayLoadedDuelAnimation: ; 1c8ef (7:48ef) ld a, [wDoFrameFunction + 0] @@ -1391,7 +1373,6 @@ PlayBufferedDuelAnimations: ; 1ca6e (7:4a6e) pop bc pop hl ret -; 0x1cab3 ; gets data from Animations for anim ID in a ; outputs the pointer to the data in hl @@ -1464,7 +1445,6 @@ Func_1cac5: ; 1cac5 (7:4ac5) ld a, $ff ld [wd4c0], a jr .asm_1cafb -; 0x1cb18 Func_1cb18: ; 1cb18 (7:4b18) push hl @@ -1508,7 +1488,6 @@ Func_1cb18: ; 1cb18 (7:4b18) .asm_1cb5b scf jr .asm_1cb57 -; 0x1cb5e Func_1cb5e: ; 1cb5e (7:4b5e) cp $96 @@ -1549,7 +1528,6 @@ Func_1cb5e: ; 1cb5e (7:4b5e) xor a ld [wd4b3], a ret -; 0x1cba6 Func_1cba6: ; 1cba6 (7:4ba6) call Func_1cc03 @@ -1577,7 +1555,6 @@ Func_1cba6: ; 1cba6 (7:4ba6) cp $03 jr c, .asm_1cbb3 ret -; 0x1cbcc Func_1cbcc: ; 1cbcc (7:4bcc) push af @@ -1608,11 +1585,10 @@ Func_1cbcc: ; 1cbcc (7:4bcc) pop af farcall Func_12ac9 ret -; 0x1cbfd ; unreferenced data? +Unknown_1cbfd: ; 1cbfd (7:4bfd) db $f0, $f8, $00, $08, $f8, $f0 -; 0x1cc03 Func_1cc03: ; 1cc03 (7:4c03) ld a, [wDuelAnimDamage] @@ -1641,7 +1617,6 @@ Func_1cc03: ; 1cc03 (7:4c03) jr nz, .asm_1cc23 .asm_1cc2e ret -; 0x1cc2f .Func_1cc2f ld a, $4e @@ -1659,7 +1634,6 @@ Func_1cc03: ; 1cc03 (7:4c03) sbc b ld h, a ret -; 0x1cc3e Func_1cc3e: ; 1cc3e (7:4c3e) push hl @@ -1670,7 +1644,6 @@ Func_1cc3e: ; 1cc3e (7:4c3e) call Func_1cbcc pop hl ret -; 0x1cc4e Func_1cc4e: ; 1cc4e (7:4c4e) push hl @@ -1684,7 +1657,6 @@ Func_1cc4e: ; 1cc4e (7:4c4e) ld [wd4b8], a pop hl ret -; 0x1cc66 Func_1cc66: ; 1cc66 (7:4c66) push hl @@ -1695,7 +1667,6 @@ Func_1cc66: ; 1cc66 (7:4c66) call Func_1cbcc pop hl ret -; 0x1cc76 ; initializes a screen animation from wTempAnimation ; loads a function pointer for updating a frame @@ -1724,7 +1695,6 @@ InitScreenAnimation: ; 1cc76 (7:4c76) call CallBC .skip ret -; 0x1cc9f ; for the following animations, these functions ; are run with the corresponding duration. @@ -1770,7 +1740,6 @@ DefaultScreenAnimationUpdate: ; 1ccbc (7:4cbc) inc hl ld [hl], HIGH(DefaultScreenAnimationUpdate) ret -; 0x1ccd4 Func_1ccd4: ; 1ccd4 (7:4cd4) ld a, 1 @@ -1781,7 +1750,6 @@ Func_1ccd4: ; 1ccd4 (7:4cd4) ld l, a call CallHL2 jr DefaultScreenAnimationUpdate -; 0x1cce4 ShakeScreenX_Small: ; 1cce4 (7:4ce4) ld hl, SmallShakeOffsets @@ -1811,7 +1779,6 @@ ShakeScreenX: ; 1ccee (7:4cee) add [hl] ldh [hSCX], a jp LoadDefaultScreenAnimationUpdateWhenFinished -; 0x1cd10 ShakeScreenY_Small: ; 1cd10 (7:4d10) ld hl, SmallShakeOffsets @@ -1840,7 +1807,6 @@ ShakeScreenY: ; 1cd1a (7:4d1a) add [hl] ldh [hSCY], a jp LoadDefaultScreenAnimationUpdateWhenFinished -; 0x1cd3c ; get the displacement of the current frame ; depending on the value of wScreenAnimDuration @@ -1863,7 +1829,6 @@ UpdateShakeOffset: ; 1cd3c (7:4d3c) pop hl scf ret -; 0x1cd55 SmallShakeOffsets: ; 1cd55 (7:4d55) db 21, 2 @@ -1887,7 +1852,6 @@ DecrementScreenAnimDuration: ; 1cd71 (7:4d71) ld hl, wScreenAnimDuration dec [hl] ret -; 0x1cd76 WhiteFlashScreen: ; 1cd76 (7:4d76) ld hl, wScreenAnimUpdatePtr @@ -1923,7 +1887,6 @@ WhiteFlashScreen: ; 1cd76 (7:4d76) call SetBGP call FlushAllPalettes jp DefaultScreenAnimationUpdate -; 0x1cdc3 DistortScreen: ; 1cdc3 (7:4dc3) ld hl, wScreenAnimUpdatePtr @@ -1959,7 +1922,6 @@ DistortScreen: ; 1cdc3 (7:4dc3) ; starting from the last and running backwards .BGScrollModData db 4, 3, 2, 1, 1, 1, 1, 2 -; 0x1ce03 Func_1ce03: ; 1ce03 (7:4e03) cp DUEL_ANIM_158 @@ -2074,7 +2036,6 @@ HandleTitleScreen: ; 1d078 (7:5078) call ResetDoFrameFunction call Func_3ca0 ret -; 0x1d0fa ; updates wHasSaveData and wHasDuelSaveData ; depending on whether the save data is valid or not @@ -2095,7 +2056,6 @@ CheckIfHasSaveData: ; 1d0fa (7:50fa) ld [wHasDuelSaveData], a farcall ValidateBackupGeneralSaveData ret -; 0x1d11c ; handles printing the Start Menu ; and getting player input and choice @@ -2228,7 +2188,6 @@ HandleStartMenu: ; 1d11c (7:511c) lb bc, 14, 1 farcall $4, DrawPlayerPortrait ret -; 0x1d1e9 ; prints the description for the current selected item ; in the Start Menu in the text box @@ -2328,7 +2287,6 @@ PrintStartMenuDescriptionText: ; 1d1e9 (7:51e9) ld bc, $a10 farcall Func_101df ret -; 0x1d289 ; asks the player whether it's okay to delete ; the save data in order to create a new one @@ -2354,7 +2312,6 @@ DeleteSaveDataForNewGame: ; 1d289 (7:5289) call PrintScrollableText_NoTextBoxLabel or a ret -; 0x1d2b8 ; asks the player if the game should resume ; from diary even though there is Duel save data @@ -2377,7 +2334,6 @@ AskToContinueFromDiaryWithDuelData: ; 1d2b8 (7:52b8) ret c or a ret -; 0x1d2dd ; shows disclaimer for Card Pop! ; in case player is not playing in CGB @@ -2401,7 +2357,6 @@ ShowCardPopCGBDisclaimer: ; 1d2dd (7:52dd) call WaitForButtonAorB scf ret -; 0x1d306 DrawPlayerPortraitAndPrintNewGameText: ; 1d306 (7:5306) call DisableLCD @@ -2419,7 +2374,6 @@ DrawPlayerPortraitAndPrintNewGameText: ; 1d306 (7:5306) call ResetDoFrameFunction call Func_3ca0 ret -; 0x1d335 PlayOpeningSequence: ; 1d335 (7:5335) call DisableLCD @@ -2494,7 +2448,6 @@ PlayOpeningSequence: ; 1d335 (7:5335) ld bc, 60 farcall Func_12ac9 ret -; 0x1d3ce LoadTitleScreenSprites: ; 1d3ce (7:53ce) xor a @@ -2536,7 +2489,6 @@ LoadTitleScreenSprites: ; 1d3ce (7:53ce) db SPRITE_LIGHTNING db SPRITE_PSYCHIC db SPRITE_FIGHTING -; 0x1d408 ; TODO place in main.asm when possible INCLUDE "engine/sequences/opening_sequence_commands.asm" @@ -2606,7 +2558,6 @@ AnimateRandomTitleScreenOrb: ; 1d614 (7:5614) dec c jr nz, .loop_orbs ret -; 0x1d67b ; unreferenced ; shows Copyright information for 300 frames @@ -2635,7 +2586,6 @@ Func_1d67b: ; 1d67b (7:567b) .exit farcall Func_10ab4 ret -; 0x1d6ad Credits_1d6ad: ; 1d6ad (7:56ad) ld a, MUSIC_STOP @@ -2714,7 +2664,6 @@ Func_1d705: ; 1d705 (7:5705) set INT_LCD_STAT, [hl] pop hl ret -; 0x1d758 Func_1d758: ; 1d758 (7:5758) push hl @@ -2724,7 +2673,6 @@ Func_1d758: ; 1d758 (7:5758) res INT_LCD_STAT, [hl] pop hl ret -; 0x1d765 Func_1d765: ; 1d765 (7:5765) push hl @@ -2820,7 +2768,6 @@ Func_1d765: ; 1d765 (7:5765) pop bc pop hl ret -; 0x1d7ee Func_1d7ee: ; 1d7ee (7:57ee) xor a @@ -2829,4 +2776,3 @@ Func_1d7ee: ; 1d7ee (7:57ee) lb hl, 0, 0 call FillRectangle ret -; 0x1d7fc diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm index c5ec128..1ad86fc 100644 --- a/src/engine/bank1c.asm +++ b/src/engine/bank1c.asm @@ -59,7 +59,6 @@ SetSGBBorder: ; 70044 (1c:4044) dw SGBBorderMedalsGfxPointers, SGBData_BorderMedals3, SGBData_BorderMedals5 dw SGBBorderMedalsGfxPointers, SGBData_BorderMedals4, SGBData_BorderMedals5 dw SGBBorderDebugGfxPointers, SGBData_BorderDebug3, SGBData_BorderDebug4 -; 0x7006f ; forces SGB border intro ; unreferenced? @@ -72,7 +71,6 @@ Func_7006f: ; 7006f (1c:406f) call SetMainSGBBorderPalsAndMap call Func_701c0 ret -; 0x70082 DecompressAndSendSGBBorder: ; 70082 (1c:4082) ld a, [wConsole] @@ -462,7 +460,6 @@ ENDM border_medal_tile v0Tiles1 + $538, $72, $10 border_medal_tile v0Tiles1 + $53a, $73, $10 border_medal_tile v0Tiles1 + $53c, $74, $10 -; 0x7036a ; decompresses palette data depending on wd132 ; then sends it as SGB packet @@ -522,7 +519,6 @@ SetSGB2AndSGB3MapPalette: ; 7036a (1c:436a) dw SGBData_MapPals8 ; MAP_SGB_PALS_8 dw SGBData_MapPals9 ; MAP_SGB_PALS_9 dw SGBData_MapPals10 ; MAP_SGB_PALS_10 -; 0x703cb Func_703cb: ; 703cb (1c:43cb) ld a, [wConsole] @@ -572,7 +568,6 @@ DecompressSGBPalette: ; 70403 (1c:4403) pop bc pop hl ret -; 0x7041d ; sends an SGB packet related with palettes Func_7041d: ; 7041d (1c:441d) @@ -650,7 +645,6 @@ Func_7041d: ; 7041d (1c:441d) pop bc pop hl ret -; 0x70498 ; send an ATTR_BLK SGB packet ; input: @@ -710,7 +704,6 @@ Func_704c7: ; 704c7 (1c:44c7) pop hl pop af ret -; 0x704d3 SGBData_BorderDebug4: ; 704d3 (1c:44d3) dw $800 ; length diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 090599f..65917fd 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -17,7 +17,6 @@ LoadMapGfxAndPermissions: ; 80000 (20:4000) farcall OverworldMap_PrintMapName farcall OverworldMap_InitVolcanoSprite ret -; 0x80028 ; reloads the map tiles and permissions ; after a textbox has been closed @@ -29,7 +28,6 @@ ReloadMapAfterTextClose: ; 80028 (20:4028) call SafelyCopyBGMapFromSRAMToVRAM farcall Func_c3ee ret -; 0x8003d LoadMapTilesAndPals: ; 8003d (20:403d) farcall LoadMapHeader @@ -57,7 +55,6 @@ LoadMapTilesAndPals: ; 8003d (20:403d) call SetBGPAndLoadedPal .asm_80076 ret -; 0x80077 ; loads the BG map corresponding to wCurTilemap to SRAM ; bc = starting coordinates @@ -401,7 +398,6 @@ LoadGraphicsPointerFromHL: ; 80229 (20:4229) add BANK(MapDataPointers) ld [wTempPointerBank], a ret -; 0x80238 ; unreferenced? Func_80238: ; 80238 (20:4238) @@ -421,7 +417,6 @@ Func_80238: ; 80238 (20:4238) call LoadGfxDataFromTempPointerToVRAMBank_Tiles0ToTiles2 pop hl ret -; 0x8025b ; loads graphics data from third map data pointers ; input: @@ -455,7 +450,7 @@ LoadGfxDataFromTempPointerToVRAMBank_Tiles0ToTiles2: ; 80279 (20:4279) ; loads graphics data pointed by wTempPointer in wTempPointerBank ; to wVRAMPointer -LoadGfxDataFromTempPointer: +LoadGfxDataFromTempPointer: ; 8027c (20:427c) push hl push bc push de @@ -519,7 +514,6 @@ GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2: ; 802bb (20:42bb) pop af ld [wVRAMTileOffset], a ret -; 0x802d4 ; loads tileset gfx to VRAM corresponding to wCurTileset LoadTilesetGfx: ; 802d4 (20:42d4) @@ -532,7 +526,6 @@ LoadTilesetGfx: ; 802d4 (20:42d4) call BankswitchVRAM0 pop hl ret -; 0x802e8 ; loads gfx data from wTempPointerBank:wTempPointer .LoadTileGfx ; 802e8 (20:42e8) @@ -580,7 +573,6 @@ LoadTilesetGfx: ; 802d4 (20:42d4) pop bc pop hl ret -; 0x80336 ; copies gfx data from wTempPointer to VRAM ; c must match with wVRAMTileOffset @@ -685,7 +677,6 @@ LoadTilesetGfx: ; 802d4 (20:42d4) pop bc pop hl ret -; 0x803b9 ; gets pointer to BG map with ID from wCurTilemap Func_803b9: ; 803b9 (20:43b9) @@ -696,7 +687,6 @@ Func_803b9: ; 803b9 (20:43b9) ld a, [hl] ld [wCurTileset], a ret -; 0x803c9 ; sets BGP in wLoadedPalData (if any) ; then loads the rest of the palette data @@ -728,7 +718,6 @@ SetBGPAndLoadedPal: ; 803c9 (20:43c9) pop bc pop hl ret -; 0x803ec ; copies from palette data in hl c*8 bytes to palette index b ; in WRAM, starting from wBackgroundPalettesCGB @@ -777,7 +766,6 @@ LoadPaletteDataFromHL: ; 803ec (20:43ec) pop bc pop hl ret -; 0x80418 ; loads palette index a LoadPaletteData: ; 80418 (20:4418) @@ -834,7 +822,6 @@ LoadPaletteData: ; 80418 (20:4418) pop bc pop hl ret -; 0x80456 ; copies palette data of index in a to wLoadedPalData LoadPaletteDataToBuffer: ; 80456 (20:4456) @@ -865,13 +852,11 @@ LoadPaletteDataToBuffer: ; 80456 (20:4456) pop bc pop hl ret -; 0x8047b ClearNumLoadedFramesetSubgroups: ; 8047b (20:447b) xor a ld [wNumLoadedFramesetSubgroups], a ret -; 0x80480 ; for the current map, process the animation ; data of its corresponding OW tiles @@ -900,7 +885,6 @@ DoMapOWFrame: ; 80480 (20:4480) pop bc pop hl ret -; 0x804a2 ; processes the OW frameset pointed by hl ProcessOWFrameset: ; 804a2 (20:44a2) @@ -933,7 +917,6 @@ ProcessOWFrameset: ; 804a2 (20:44a2) pop bc pop hl ret -; 0x804d8 ; for each of the loaded frameset subgroups ; load their tiles and advance their durations @@ -954,7 +937,6 @@ DoLoadedFramesetSubgroupsFrame: ; 804d8 (20:44d8) cp NUM_OW_FRAMESET_SUBGROUPS jr c, .loop_subgroups ret -; 0x804f3 ; from subgroup in register c, get ; from OW frameset in hl its corresponding @@ -979,7 +961,6 @@ GetOWFramesetSubgroupData: ; 804f3 (20:44f3) pop bc pop hl ret -; 0x8050c ; if wCurOWFrameDuration == 0, processes next frame for OW map ; by loading the tiles corresponding to current frame @@ -1100,7 +1081,6 @@ LoadOWFrameTiles: ; 8050c (20:450c) pop bc pop hl ret -; 0x8059a ; fills wOWFramesetSubgroups with $ff ClearOWFramesetSubgroups: ; 8059a (20:459a) @@ -1116,7 +1096,6 @@ ClearOWFramesetSubgroups: ; 8059a (20:459a) pop bc pop hl ret -; 0x805aa ; copies wOWFramesetSubgroups + 2*c ; to wCurOWFrameDataOffset and wCurOWFrameDuration @@ -1137,7 +1116,6 @@ LoadOWFramesetSubgroup: ; 805aa (20:45aa) pop bc pop hl ret -; 0x805c1 ; copies wCurOWFrameDataOffset and wCurOWFrameDuration ; to wOWFramesetSubgroups + 2*c @@ -1155,7 +1133,6 @@ StoreOWFramesetSubgroup: ; 805c1 (20:45c1) pop bc pop hl ret -; 0x805d6 INCLUDE "data/map_ow_framesets.asm" @@ -1173,7 +1150,6 @@ Func_80b7a: ; 80b7a (20:4b7a) pop bc pop hl ret -; 0x80b89 ; a = MAP_EVENT_* constant Func_80b89: ; 80b89 (20:4b89) diff --git a/src/engine/deck_ai/decks/fire_charge.asm b/src/engine/deck_ai/decks/fire_charge.asm index 4253d55..f5b347b 100644 --- a/src/engine/deck_ai/decks/fire_charge.asm +++ b/src/engine/deck_ai/decks/fire_charge.asm @@ -78,4 +78,3 @@ AIActionTable_FireCharge: ; 15232 (5:5232) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x152bd diff --git a/src/engine/deck_ai/decks/first_strike.asm b/src/engine/deck_ai/decks/first_strike.asm index 9f5934d..2e636e1 100644 --- a/src/engine/deck_ai/decks/first_strike.asm +++ b/src/engine/deck_ai/decks/first_strike.asm @@ -74,4 +74,3 @@ AIActionTable_FirstStrike: ; 14e89 (5:4e89) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x14f0e diff --git a/src/engine/deck_ai/decks/flower_power.asm b/src/engine/deck_ai/decks/flower_power.asm index 47bbd55..4d423a3 100644 --- a/src/engine/deck_ai/decks/flower_power.asm +++ b/src/engine/deck_ai/decks/flower_power.asm @@ -73,4 +73,3 @@ AIActionTable_FlowerPower: ; 1509b (5:509b) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x15122 diff --git a/src/engine/deck_ai/decks/general.asm b/src/engine/deck_ai/decks/general.asm index dd9060e..039e101 100644 --- a/src/engine/deck_ai/decks/general.asm +++ b/src/engine/deck_ai/decks/general.asm @@ -192,4 +192,3 @@ AIProcessRetreat: ; 14786 (5:4786) ld a, AI_ENERGY_TRANS_RETREAT ; retreat farcall HandleAIEnergyTrans ret -; 0x147bd diff --git a/src/engine/deck_ai/decks/general_no_retreat.asm b/src/engine/deck_ai/decks/general_no_retreat.asm index 4b962d4..20d84e3 100644 --- a/src/engine/deck_ai/decks/general_no_retreat.asm +++ b/src/engine/deck_ai/decks/general_no_retreat.asm @@ -138,4 +138,3 @@ AIDoTurn_GeneralNoRetreat: ; 148ff (5:48ff) ld a, OPPACTION_FINISH_NO_ATTACK bank1call AIMakeDecision ret -; 0x149e8 diff --git a/src/engine/deck_ai/decks/go_go_rain_dance.asm b/src/engine/deck_ai/decks/go_go_rain_dance.asm index cf18893..23547e2 100644 --- a/src/engine/deck_ai/decks/go_go_rain_dance.asm +++ b/src/engine/deck_ai/decks/go_go_rain_dance.asm @@ -77,4 +77,3 @@ AIActionTable_GoGoRainDance: ; 14f8f (5:4f8f) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x15019 diff --git a/src/engine/deck_ai/decks/im_ronald.asm b/src/engine/deck_ai/decks/im_ronald.asm index 8d8de6d..b002d83 100644 --- a/src/engine/deck_ai/decks/im_ronald.asm +++ b/src/engine/deck_ai/decks/im_ronald.asm @@ -78,4 +78,3 @@ AIActionTable_ImRonald: ; 152bd (5:52bd) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x1534b diff --git a/src/engine/deck_ai/decks/invincible_ronald.asm b/src/engine/deck_ai/decks/invincible_ronald.asm index c228577..463560b 100644 --- a/src/engine/deck_ai/decks/invincible_ronald.asm +++ b/src/engine/deck_ai/decks/invincible_ronald.asm @@ -76,4 +76,3 @@ AIActionTable_InvincibleRonald: ; 153e8 (5:53e8) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x1546f diff --git a/src/engine/deck_ai/decks/legendary_articuno.asm b/src/engine/deck_ai/decks/legendary_articuno.asm index 6b3b9f8..6409330 100644 --- a/src/engine/deck_ai/decks/legendary_articuno.asm +++ b/src/engine/deck_ai/decks/legendary_articuno.asm @@ -207,4 +207,3 @@ AIDoTurn_LegendaryArticuno: ; 14cf7 (5:4cf7) ld a, OPPACTION_FINISH_NO_ATTACK bank1call AIMakeDecision ret -; 0x14d60 diff --git a/src/engine/deck_ai/decks/legendary_dragonite.asm b/src/engine/deck_ai/decks/legendary_dragonite.asm index 2b8cef6..597f72c 100644 --- a/src/engine/deck_ai/decks/legendary_dragonite.asm +++ b/src/engine/deck_ai/decks/legendary_dragonite.asm @@ -164,4 +164,3 @@ AIDoTurn_LegendaryDragonite: ; 14def (5:4def) ld a, OPPACTION_FINISH_NO_ATTACK bank1call AIMakeDecision ret -; 0x14e89 diff --git a/src/engine/deck_ai/decks/legendary_moltres.asm b/src/engine/deck_ai/decks/legendary_moltres.asm index 2f67c3e..d07afb9 100644 --- a/src/engine/deck_ai/decks/legendary_moltres.asm +++ b/src/engine/deck_ai/decks/legendary_moltres.asm @@ -174,4 +174,3 @@ AIDoTurn_LegendaryMoltres: ; 14a81 (5:4a81) ld a, OPPACTION_FINISH_NO_ATTACK bank1call AIMakeDecision ret -; 0x14b0f diff --git a/src/engine/deck_ai/decks/legendary_ronald.asm b/src/engine/deck_ai/decks/legendary_ronald.asm index 5272f81..3356838 100644 --- a/src/engine/deck_ai/decks/legendary_ronald.asm +++ b/src/engine/deck_ai/decks/legendary_ronald.asm @@ -201,4 +201,3 @@ AIDoTurn_LegendaryRonald: ; 15507 (5:5507) ld a, OPPACTION_FINISH_NO_ATTACK bank1call AIMakeDecision ret -; 0x155d2 diff --git a/src/engine/deck_ai/decks/legendary_zapdos.asm b/src/engine/deck_ai/decks/legendary_zapdos.asm index 3a74ac6..cc99f0c 100644 --- a/src/engine/deck_ai/decks/legendary_zapdos.asm +++ b/src/engine/deck_ai/decks/legendary_zapdos.asm @@ -151,4 +151,3 @@ AIDoTurn_LegendaryZapdos: ; 14b9a (5:4b9a) ld a, OPPACTION_FINISH_NO_ATTACK bank1call AIMakeDecision ret -; 0x14c0b diff --git a/src/engine/deck_ai/decks/powerful_ronald.asm b/src/engine/deck_ai/decks/powerful_ronald.asm index 9f1b0f3..096fbea 100644 --- a/src/engine/deck_ai/decks/powerful_ronald.asm +++ b/src/engine/deck_ai/decks/powerful_ronald.asm @@ -90,4 +90,3 @@ AIActionTable_PowerfulRonald: ; 1534b (5:534b) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x153e8 diff --git a/src/engine/deck_ai/decks/rock_crusher.asm b/src/engine/deck_ai/decks/rock_crusher.asm index 7e5cb0a..41a50fa 100644 --- a/src/engine/deck_ai/decks/rock_crusher.asm +++ b/src/engine/deck_ai/decks/rock_crusher.asm @@ -72,4 +72,3 @@ AIActionTable_RockCrusher: ; 14f0e (5:4f0e) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x14f8f diff --git a/src/engine/deck_ai/decks/sams_practice.asm b/src/engine/deck_ai/decks/sams_practice.asm index b92253d..dddce61 100644 --- a/src/engine/deck_ai/decks/sams_practice.asm +++ b/src/engine/deck_ai/decks/sams_practice.asm @@ -203,4 +203,3 @@ AIPerformScriptedTurn: ; 1483a (5:483a) ld e, FIGHTING_ENERGY call AIAttachEnergyInHandToCardInPlayArea ret -; 0x148dc diff --git a/src/engine/deck_ai/decks/strange_psyshock.asm b/src/engine/deck_ai/decks/strange_psyshock.asm index 1ab948c..ef378b0 100644 --- a/src/engine/deck_ai/decks/strange_psyshock.asm +++ b/src/engine/deck_ai/decks/strange_psyshock.asm @@ -79,4 +79,3 @@ AIActionTable_StrangePsyshock: ; 15122 (5:5122) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x151ad diff --git a/src/engine/deck_ai/decks/wonders_of_science.asm b/src/engine/deck_ai/decks/wonders_of_science.asm index 24ad09d..706a7e6 100644 --- a/src/engine/deck_ai/decks/wonders_of_science.asm +++ b/src/engine/deck_ai/decks/wonders_of_science.asm @@ -75,4 +75,3 @@ AIActionTable_WondersOfScience: ; 151ad (5:51ad) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x15232 diff --git a/src/engine/deck_ai/decks/zapping_selfdestruct.asm b/src/engine/deck_ai/decks/zapping_selfdestruct.asm index b924061..da5e7c6 100644 --- a/src/engine/deck_ai/decks/zapping_selfdestruct.asm +++ b/src/engine/deck_ai/decks/zapping_selfdestruct.asm @@ -73,4 +73,3 @@ AIActionTable_ZappingSelfdestruct: ; 15019 (5:5019) ; missing store_list_pointer wAICardListRetreatBonus, .list_retreat store_list_pointer wAICardListEnergyBonus, .list_energy ret -; 0x1509b diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index f67a89b..1065411 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -293,7 +293,6 @@ SetDefiniteDamage: ; 2c166 (b:4166) xor a ld [wDamage + 1], a ret -; 0x2c174 ; overwrites wAIMinDamage and wAIMaxDamage ; with value in wDamage. @@ -302,7 +301,6 @@ SetDefiniteAIDamage: ; 2c174 (b:4174) ld [wAIMinDamage], a ld [wAIMaxDamage], a ret -; 0x2c17e ; returns in a some random occupied Play Area location ; in Turn Duelist's Play Area. @@ -312,7 +310,6 @@ PickRandomPlayAreaCard: ; 2c17e (b:417e) call Random or a ret -; 0x2c188 ; outputs in hl the next position ; in hTempList to place a new card, @@ -328,7 +325,6 @@ GetNextPositionInTempList: ; 2c188 (b:4188) add hl, de pop de ret -; 0x2c197 ; creates in wDuelTempList list of attached Fire Energy cards ; that are attached to the Turn Duelist's Arena card. @@ -376,7 +372,6 @@ CreateListOfEnergyAttachedToArena: ; 2c199 (b:4199) ld [de], a ld a, c ret -; 0x2c1c4 ; prints the text "<X> devolved to <Y>!" with ; the proper card names and levels. @@ -410,7 +405,6 @@ PrintDevolvedCardNameAndLevelText: ; 2c1c4 (b:41c4) call DrawWideTextBox_WaitForInput pop de ret -; 0x2c1ec HandleSwitchDefendingPokemonEffect: ; 2c1ec (b:41ec) ld e, a @@ -454,7 +448,6 @@ HandleNoDamageOrEffect: ; 2c216 (b:4216) call nz, DrawWideTextBox_PrintText scf ret -; 0x2c221 ; applies HP recovery on Pokemon after an attack ; with HP recovery effect, and handles its animation. @@ -508,7 +501,6 @@ ApplyAndAnimateHPRecovery: ; 2c221 (b:4221) ld [hl], e ; apply new HP to arena card bank1call WaitAttackAnimation ret -; 0x2c25b ; returns carry if Play Area has no damage counters. CheckIfPlayAreaHasAnyDamage: ; 2c25b (b:425b) @@ -526,7 +518,6 @@ CheckIfPlayAreaHasAnyDamage: ; 2c25b (b:425b) ; no damage found scf ret -; 0x2c26e ; makes a list in wDuelTempList with the deck indices ; of Trainer cards found in Turn Duelist's Discard Pile. @@ -573,7 +564,6 @@ CreateTrainerCardListFromDiscardPile: ; 2c26e (b:426e) ldtx hl, ThereAreNoTrainerCardsInDiscardPileText scf ret -; 0x2c2a0 ; makes a list in wDuelTempList with the deck indices ; of all basic energy cards found in Turn Duelist's Discard Pile. @@ -652,7 +642,6 @@ CreateEnergyCardListFromDiscardPile: ; 2c2a6 (b:42a6) .set_carry scf ret -; 0x2c2e0 ; returns carry if Deck is empty CheckIfDeckIsEmpty: ; 2c2e0 (b:42e0) @@ -662,7 +651,6 @@ CheckIfDeckIsEmpty: ; 2c2e0 (b:42e0) cp DECK_SIZE ccf ret -; 0x2c2ec ; searches through Deck in wDuelTempList looking for ; a certain card or cards, and prints text depending @@ -706,7 +694,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) ldtx hl, WouldYouLikeToCheckTheDeckText call YesOrNoMenuWithText_SetCursorToYes ret -; 0x2c317 .search_table dw .SearchDeckForCardID @@ -718,7 +705,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) .set_carry ; 2c321 (b:4321) scf ret -; 0x2c323 ; returns carry if no card with ; same card ID as e is found in Deck @@ -736,7 +722,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) jr nz, .loop_deck_e or a ret -; 0x2c336 ; returns carry if no NidoranM or NidoranF card is found in Deck .SearchDeckForNidoran ; 2c336 (b:4336) @@ -754,7 +739,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) .found_nidoran or a ret -; 0x2c34c ; returns carry if no Basic Fighting Pokemon is found in Deck .SearchDeckForBasicFighting ; 2c34c (b:434c) @@ -771,7 +755,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) or a ; BASIC jr nz, .loop_deck_fighting ret -; 0x2c365 ; returns carry if no Basic Energy cards are found in Deck .SearchDeckForBasicEnergy ; 2c365 (b:4365) @@ -788,7 +771,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) jr z, .loop_deck_energy or a ret -; 0x2c37d ; returns carry if no Pokemon cards are found in Deck .SearchDeckForPokemon ; 2c37d (b:437d) @@ -803,7 +785,6 @@ LookForCardsInDeck: ; 2c2ec (b:42ec) jr nc, .loop_deck_pkmn or a ret -; 0x2c391 ; handles the Player selection of attack ; to use, i.e. Amnesia or Metronome on. @@ -869,7 +850,6 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391) bank1call DrawDuelMainScene call SwapTurn jr .start -; 0x2c3f4 .menu_parameters db 1, 13 ; cursor x, cursor y @@ -878,7 +858,6 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391) db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; 0x2c3fc ; loads in hl the pointer to attack's name. ; input: @@ -897,7 +876,6 @@ GetAttackName: ; 2c3fc (b:43fc) ld h, [hl] ld l, a ret -; 0x2c40e ; returns carry if Defending Pokemon ; doesn't have an attack. @@ -920,7 +898,6 @@ CheckIfDefendingPokemonHasAnyAttack: ; 2c40e (b:440e) call SwapTurn or a ret -; 0x2c431 ; overwrites HP and Stage data of the card that was ; devolved in the Play Area to the values of new card. @@ -962,7 +939,6 @@ UpdateDevolvedCardHPAndStage: ; 2c431 (b:4431) pop de pop bc ret -; 0x2c45d ; reset various status after devolving card. ResetDevolvedCardStatus: ; 2c45d (b:445d) @@ -983,7 +959,6 @@ ResetDevolvedCardStatus: ; 2c45d (b:445d) ld l, a ld [hl], $00 ret -; 0x2c476 ; prompts the Player with a Yes/No question ; whether to quit the screen, even though @@ -1003,7 +978,6 @@ AskWhetherToQuitSelectingCards: ; 2c476 (b:4476) ldtx hl, YouCanSelectMoreCardsQuitText call YesOrNoMenuWithText ret -; 0x2c487 ; handles the selection of a forced switch by link/AI opponent or by the player. ; outputs the Play Area location of the chosen bench card in hTempPlayAreaLocation_ff9d. @@ -1056,7 +1030,6 @@ DuelistSelectForcedSwitch: ; 2c487 (b:4487) .received ldh [hTempPlayAreaLocation_ff9d], a ret -; 0x2c4da ; returns in a the card index of energy card ; attached to Defending Pokemon @@ -1128,7 +1101,6 @@ AIPickEnergyCardToDiscardFromDefendingPokemon: ; 2c4da (b:44da) ld hl, wDuelTempList call ShuffleCards jr .done_chosen -; 0x2c532 ; handles AI logic to pick attack for Amnesia AIPickAttackForAmnesia: ; 2c532 (b:4532) @@ -1162,7 +1134,6 @@ AIPickAttackForAmnesia: ; 2c532 (b:4532) ld a, e call SwapTurn ret -; 0x2c564 ; Return in a the PLAY_AREA_* of the non-turn holder's Pokemon card in bench with the lowest (remaining) HP. ; if multiple cards are tied for the lowest HP, the one with the highest PLAY_AREA_* is returned. @@ -1194,7 +1165,6 @@ GetBenchPokemonWithLowestHP: ; 2c564 (b:4564) ld a, d call SwapTurn ret -; 0x2c588 ; handles drawing and selection of screen for ; choosing a color (excluding colorless), for use @@ -1245,7 +1215,6 @@ HandleColorChangeScreen: ; 2c588 (b:4588) db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; 0x2c5be .DrawScreen: ; 2c5be (b:45be) push hl @@ -1354,7 +1323,6 @@ HandleColorChangeScreen: ; 2c588 (b:4588) dec c jr nz, .loop_colors ret -; 0x2c686 ; loads wTxRam2 and wTxRam2_b: ; [wTxRam2] <- wLoadedCard1Name @@ -1384,7 +1352,6 @@ LoadCardNameAndInputColor: ; 2c686 (b:4686) ld a, [hli] ld [de], a ret -; 0x2c6a1 ShiftMenuData: ; 2c6a1 (b:46a1) ; x, y, text id @@ -1395,12 +1362,12 @@ ShiftMenuData: ; 2c6a1 (b:46a1) ColorTileAndBGP: ; 2c6ae (b:46ae) ; tile, BG - db $E4, $02 - db $E0, $01 - db $EC, $02 - db $E8, $01 - db $F0, $03 - db $F4, $03 + db $e4, $02 + db $e0, $01 + db $eC, $02 + db $e8, $01 + db $f0, $03 + db $f4, $03 ShiftListItemToColor: ; 2c6ba (b:46ba) db GRASS @@ -1429,14 +1396,12 @@ DrawSymbolOnPlayAreaCursor: ; 2c6cc (b:46cc) ld b, 0 call WriteByteToBGMap0 ret -; 0x2c6d9 ; possibly unreferenced Func_2c6d9: ; 2c6d9 (b:46d9) ldtx hl, IncompleteText call DrawWideTextBox_WaitForInput ret -; 0x2c6e0 PlayAreaSelectionMenuParameters: ; 2c6e0 (b:46e0) db 0, 0 ; cursor x, cursor y @@ -1445,7 +1410,6 @@ PlayAreaSelectionMenuParameters: ; 2c6e0 (b:46e0) db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; 0x2c6e8 BenchSelectionMenuParameters: ; 2c6e8 (b:46e8) db 0, 3 ; cursor x, cursor y @@ -1454,7 +1418,6 @@ BenchSelectionMenuParameters: ; 2c6e8 (b:46e8) db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; 0x2c6f0 SpitPoison_AIEffect: ; 2c6f0 (b:46f0) ld a, 10 / 2 @@ -1515,7 +1478,6 @@ WeepinbellPoisonPowder_AIEffect: ; 2c738 (b:4738) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2c740 ; return carry if there are no Pokemon cards in the non-turn holder's bench VictreebelLure_AssertPokemonInBench: ; 2c740 (b:4740) @@ -1524,7 +1486,6 @@ VictreebelLure_AssertPokemonInBench: ; 2c740 (b:4740) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2c74b ; return in hTempPlayAreaLocation_ffa1 the PLAY_AREA_* location ; of the Bench Pokemon that was selected for switch @@ -1540,7 +1501,6 @@ VictreebelLure_SelectSwitchPokemon: ; 2c74b (b:474b) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2c764 ; Return in hTemp_ffa0 the PLAY_AREA_* of the non-turn holder's Pokemon card in bench with the lowest (remaining) HP. ; if multiple cards are tied for the lowest HP, the one with the highest PLAY_AREA_* is returned. @@ -1548,7 +1508,6 @@ VictreebelLure_GetBenchPokemonWithLowestHP: ; 2c764 (b:4764) call GetBenchPokemonWithLowestHP ldh [hTemp_ffa0], a ret -; 0x2c76a ; Defending Pokemon is swapped out for the one with the PLAY_AREA_* at hTemp_ffa0 ; unless Mew's Neutralizing Shield or Haunter's Transparency prevents it. @@ -1600,7 +1559,6 @@ KakunaPoisonPowder_AIEffect: ; 2c7b4 (b:47b4) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2c7bc GolbatLeechLifeEffect: ; 2c7bc (b:47bc) ld hl, wDealtDamage @@ -1609,7 +1567,6 @@ GolbatLeechLifeEffect: ; 2c7bc (b:47bc) ld d, [hl] call ApplyAndAnimateHPRecovery ret -; 0x2c7c6 VenonatLeechLifeEffect: ; 2c7c6 (b:47c6) ld hl, wDealtDamage @@ -1618,7 +1575,6 @@ VenonatLeechLifeEffect: ; 2c7c6 (b:47c6) ld d, [hl] call ApplyAndAnimateHPRecovery ret -; 0x2c7d0 ; During your next turn, double damage SwordsDanceEffect: ; 2c7d0 (b:47d0) @@ -1634,7 +1590,6 @@ ZubatSupersonicEffect: ; 2c7dc (b:47dc) call Confusion50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2c7e3 ZubatLeechLifeEffect: ; 2c7e3 (b:47e3) ld hl, wDealtDamage @@ -1643,7 +1598,6 @@ ZubatLeechLifeEffect: ; 2c7e3 (b:47e3) ld d, [hl] call ApplyAndAnimateHPRecovery ret -; 0x2c7ed Twineedle_AIEffect: ; 2c7ed (b:47ed) ld a, 60 / 2 @@ -1663,13 +1617,11 @@ Twineedle_MultiplierEffect: ; 2c7f5 (b:47f5) call ATimes10 call SetDefiniteDamage ret -; 0x2c80d BeedrillPoisonSting_AIEffect: ; 2c80d (b:480d) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2c815 ExeggcuteLeechSeedEffect: ; 2c815 (b:4815) ld hl, wDealtDamage @@ -1679,7 +1631,6 @@ ExeggcuteLeechSeedEffect: ; 2c815 (b:4815) ld de, 10 call ApplyAndAnimateHPRecovery ret -; 0x2c822 FoulGas_AIEffect: ; 2c822 (b:4822) ld a, 5 @@ -1704,7 +1655,6 @@ MetapodStiffenEffect: ; 2c836 (b:4836) ld a, SUBSTATUS1_NO_DAMAGE_STIFFEN call ApplySubstatus1ToDefendingCard ret -; 0x2c84a ; returns carry if no cards in Deck or if ; Play Area is full already. @@ -1717,7 +1667,6 @@ Sprout_CheckDeckAndPlayArea: ; 2c84a (b:484a) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2c85a Sprout_PlayerSelectEffect: ; 2c85a (b:485a) ld a, $ff @@ -1780,7 +1729,6 @@ Sprout_PlayerSelectEffect: ; 2c85a (b:485a) ldh [hTemp_ffa0], a or a ret -; 0x2c8b7 Sprout_AISelectEffect: ; 2c8b7 (b:48b7) call CreateDeckCardList @@ -1795,7 +1743,6 @@ Sprout_AISelectEffect: ; 2c8b7 (b:48b7) cp ODDISH jr nz, .loop_deck ret ; Oddish found -; 0x2c8cc Sprout_PutInPlayAreaEffect: ; 2c8cc (b:48cc) ldh a, [hTemp_ffa0] @@ -1813,7 +1760,6 @@ Sprout_PutInPlayAreaEffect: ; 2c8cc (b:48cc) .shuffle call Func_2c0bd ret -; 0x2c8ec ; returns carry if no Pokemon on Bench Teleport_CheckBench: ; 2c8ec (b:48ec) @@ -1822,7 +1768,6 @@ Teleport_CheckBench: ; 2c8ec (b:48ec) ldtx hl, ThereAreNoPokemonOnBenchText cp 2 ret -; 0x2c8f7 Teleport_PlayerSelectEffect: ; 2c8f7 (b:48f7) ldtx hl, SelectPkmnOnBenchToSwitchWithActiveText @@ -1836,7 +1781,6 @@ Teleport_PlayerSelectEffect: ; 2c8f7 (b:48f7) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2c90f Teleport_AISelectEffect: ; 2c90f (b:490f) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -1844,7 +1788,6 @@ Teleport_AISelectEffect: ; 2c90f (b:490f) call Random ldh [hTemp_ffa0], a ret -; 0x2c91a Teleport_SwitchEffect: ; 2c91a (b:491a) ldh a, [hTemp_ffa0] @@ -1853,7 +1796,6 @@ Teleport_SwitchEffect: ; 2c91a (b:491a) xor a ld [wDuelDisplayedScreen], a ret -; 0x2c925 BigEggsplosion_AIEffect: ; 2c925 (b:4925) ldh a, [hTempPlayAreaLocation_ff9d] @@ -1933,7 +1875,6 @@ Toxic_AIEffect: ; 2c98c (b:498c) Toxic_DoublePoisonEffect: ; 2c994 (b:4994) call DoublePoisonEffect ret -; 0x2c998 BoyfriendsEffect: ; 2c998 (b:4998) ld a, DUELVARS_ARENA_CARD @@ -1961,13 +1902,11 @@ BoyfriendsEffect: ; 2c998 (b:4998) call ATimes10 call AddToDamage ; adds 2 * 10 * c ret -; 0x2c9be NidoranFFurySwipes_AIEffect: ; 2c9be (b:49be) ld a, 30 / 2 lb de, 0, 30 jp SetExpectedAIDamage -; 0x2c9c6 NidoranFFurySwipes_MultiplierEffect: ; 2c9c6 (b:49c6) ld hl, 10 @@ -1978,7 +1917,6 @@ NidoranFFurySwipes_MultiplierEffect: ; 2c9c6 (b:49c6) call ATimes10 call SetDefiniteDamage ret -; 0x2c9db NidoranFCallForFamily_CheckDeckAndPlayArea: ; 2c9db (b:49db) call CheckIfDeckIsEmpty @@ -1989,7 +1927,6 @@ NidoranFCallForFamily_CheckDeckAndPlayArea: ; 2c9db (b:49db) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2c9eb NidoranFCallForFamily_PlayerSelectEffect: ; 2c9eb (b:49eb) ld a, $ff @@ -2057,7 +1994,6 @@ NidoranFCallForFamily_PlayerSelectEffect: ; 2c9eb (b:49eb) ldh [hTemp_ffa0], a or a ret -; 0x2ca55 NidoranFCallForFamily_AISelectEffect: ; 2ca55 (b:4a55) call CreateDeckCardList @@ -2075,7 +2011,6 @@ NidoranFCallForFamily_AISelectEffect: ; 2ca55 (b:4a55) jr nz, .loop_deck .found ret -; 0x2ca6e NidoranFCallForFamily_PutInPlayAreaEffect: ; 2ca6e (b:4a6e) ldh a, [hTemp_ffa0] @@ -2093,13 +2028,11 @@ NidoranFCallForFamily_PutInPlayAreaEffect: ; 2ca6e (b:4a6e) .shuffle call Func_2c0bd ret -; 0x2ca8e HornHazard_AIEffect: ; 2ca8e (b:4a8e) ld a, 30 / 2 lb de, 0, 30 jp SetExpectedAIDamage -; 0x2ca96 HornHazard_NoDamage50PercentEffect: ; 2ca96 (b:4a96) ldtx de, DamageCheckIfTailsNoDamageText @@ -2113,19 +2046,16 @@ HornHazard_NoDamage50PercentEffect: ; 2ca96 (b:4a96) ld a, ATK_ANIM_HIT ld [wLoadedAttackAnimation], a ret -; 0x2caac NidorinaSupersonicEffect: ; 2caac (b:4aac) call Confusion50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2cab3 NidorinaDoubleKick_AIEffect: ; 2cab3 (b:4ab3) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2cabb NidorinaDoubleKick_MultiplierEffect: ; 2cabb (b:4abb) ld hl, 30 @@ -2139,13 +2069,11 @@ NidorinaDoubleKick_MultiplierEffect: ; 2cabb (b:4abb) call ATimes10 call SetDefiniteDamage ret -; 0x2cad3 NidorinoDoubleKick_AIEffect: ; 2cad3 (b:4ad3) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2cadb NidorinoDoubleKick_MultiplierEffect: ; 2cabb (b:4abb) ld hl, 30 @@ -2159,7 +2087,6 @@ NidorinoDoubleKick_MultiplierEffect: ; 2cabb (b:4abb) call ATimes10 call SetDefiniteDamage ret -; 0x2caf3 ButterfreeWhirlwind_CheckBench: ; 2caf3 (b:4af3) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -2175,13 +2102,11 @@ ButterfreeWhirlwind_CheckBench: ; 2caf3 (b:4af3) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2cb09 ButterfreeWhirlwind_SwitchEffect: ; 2cb09 (b:4b09) ldh a, [hTemp_ffa0] call HandleSwitchDefendingPokemonEffect ret -; 0x2cb0f ButterfreeMegaDrainEffect: ; 2cb0f (b:4b0f) ld hl, wDealtDamage @@ -2200,19 +2125,16 @@ ButterfreeMegaDrainEffect: ; 2cb0f (b:4b0f) ld d, h call ApplyAndAnimateHPRecovery ret -; 0x2cb27 WeedlePoisonSting_AIEffect: ; 2cb27 (b:4b27) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2cb2f IvysaurPoisonPowder_AIEffect: ; 2cb2f (b:4b2f) ld a, 10 lb de, 10, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2cb37 BulbasaurLeechSeedEffect: ; 2cb37 (b:4b37) ld hl, wDealtDamage @@ -2222,7 +2144,6 @@ BulbasaurLeechSeedEffect: ; 2cb37 (b:4b37) lb de, 0, 10 call ApplyAndAnimateHPRecovery ret -; 0x2cb44 ; returns carry if no Grass Energy in Play Area EnergyTrans_CheckPlayArea: ; 2cb44 (b:4b44) @@ -2256,14 +2177,12 @@ EnergyTrans_CheckPlayArea: ; 2cb44 (b:4b44) ldtx hl, NoGrassEnergyText scf ret -; 0x2cb6f EnergyTrans_PrintProcedure: ; 2cb6f (b:4b6f) ldtx hl, ProcedureForEnergyTransferText bank1call DrawWholeScreenTextBox or a ret -; 0x2cb77 EnergyTrans_TransferEffect: ; 2cb77 (b:4b77) ld a, DUELVARS_DUELIST_TYPE @@ -2349,7 +2268,6 @@ EnergyTrans_TransferEffect: ; 2cb77 (b:4b77) .play_sfx call Func_3794 jr .loop_input_take -; 0x2cbfb EnergyTrans_AIEffect: ; 2cbfb (b:4bfb) ldh a, [hAIEnergyTransPlayAreaLocation] @@ -2359,7 +2277,6 @@ EnergyTrans_AIEffect: ; 2cbfb (b:4bfb) call PutHandCardInPlayArea bank1call PrintPlayAreaCardList_EnableLCD ret -; 0x2cc0a ; returns carry if no Grass Energy cards ; attached to card in Play Area location of a. @@ -2395,24 +2312,20 @@ CheckIfCardHasGrassEnergyAttached: ; 2cc0a (b:4c0a) ld a, l or a ret -; 0x2cc30 GrimerMinimizeEffect: ; 2cc30 (b:4c30) ld a, SUBSTATUS1_REDUCE_BY_20 call ApplySubstatus1ToDefendingCard ret -; 0x2cc36 ToxicGasEffect: ; 2cc36 (b:4c36) scf ret -; 0x2cc38 Sludge_AIEffect: ; 2cc38 (b:4c38) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2cc40 ; returns carry if no cards in Deck ; or if Play Area is full already. @@ -2425,7 +2338,6 @@ BellsproutCallForFamily_CheckDeckAndPlayArea: ; 2cc40 (b:4c40) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2cc50 BellsproutCallForFamily_PlayerSelectEffect: ; 2cc50 (b:4c50) ld a, $ff @@ -2488,7 +2400,6 @@ BellsproutCallForFamily_PlayerSelectEffect: ; 2cc50 (b:4c50) ldh [hTemp_ffa0], a or a ret -; 0x2ccad BellsproutCallForFamily_AISelectEffect: ; 2ccad (b:4cad) call CreateDeckCardList @@ -2503,7 +2414,6 @@ BellsproutCallForFamily_AISelectEffect: ; 2ccad (b:4cad) cp BELLSPROUT jr nz, .loop_deck ret ; Bellsprout found -; 0x2ccc2 BellsproutCallForFamily_PutInPlayAreaEffect: ; 2ccc2 (b:4cc2) ldh a, [hTemp_ffa0] @@ -2520,13 +2430,11 @@ BellsproutCallForFamily_PutInPlayAreaEffect: ; 2ccc2 (b:4cc2) .shuffle call Func_2c0bd ret -; 0x2cce2 WeezingSmog_AIEffect: ; 2cce2 (b:4ce2) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2ccea WeezingSelfdestructEffect: ; 2ccea (b:4cea) ld a, 60 @@ -2542,7 +2450,6 @@ WeezingSelfdestructEffect: ; 2ccea (b:4cea) call DealDamageToAllBenchedPokemon call SwapTurn ret -; 0x2cd09 Shift_OncePerTurnCheck: ; 2cd09 (b:4d09) ldh a, [hTempPlayAreaLocation_ff9d] @@ -2558,7 +2465,6 @@ Shift_OncePerTurnCheck: ; 2cd09 (b:4d09) ldtx hl, OnlyOncePerTurnText scf ret -; 0x2cd21 Shift_PlayerSelectEffect: ; 2cd21 (b:4d21) ldtx hl, ChoosePokemonWishToColorChangeText @@ -2581,7 +2487,6 @@ Shift_PlayerSelectEffect: ; 2cd21 (b:4d21) ldtx hl, UnableToSelectText call DrawWideTextBox_WaitForInput jr Shift_PlayerSelectEffect ; loop back to start -; 0x2cd44 ; checks in input color in a exists in Turn Duelist's Play Area ; returns carry if not found. @@ -2604,7 +2509,6 @@ Shift_PlayerSelectEffect: ; 2cd21 (b:4d21) ; not found scf ret -; 0x2cd5d Shift_ChangeColorEffect: ; 2cd5d (b:4d5d) ldh a, [hTemp_ffa0] @@ -2627,13 +2531,11 @@ Shift_ChangeColorEffect: ; 2cd5d (b:4d5d) ldtx hl, ChangedTheColorOfText call DrawWideTextBox_WaitForInput ret -; 0x2cd84 VenomPowder_AIEffect: ; 2cd84 (b:4d84) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage -; 0x2cd8c VenomPowder_PoisonConfusion50PercentEffect: ; 2cd8c (b:4d8c) ldtx de, VenomPowderCheckText @@ -2647,13 +2549,11 @@ VenomPowder_PoisonConfusion50PercentEffect: ; 2cd8c (b:4d8c) ld a, CONFUSED | POISONED ld [wNoEffectFromWhichStatus], a ret -; 0x2cda0 TangelaPoisonPowder_AIEffect: ; 2cda0 (b:4da0) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2cda8 Heal_OncePerTurnCheck: ; 2cda8 (b:4da8) ldh a, [hTempPlayAreaLocation_ff9d] @@ -2675,7 +2575,6 @@ Heal_OncePerTurnCheck: ; 2cda8 (b:4da8) ldtx hl, OnlyOncePerTurnText scf ret -; 0x2cdc7 Heal_RemoveDamageEffect: ; 2cdc7 (b:4dc7) ldtx de, IfHeadsHealIsSuccessfulText @@ -2731,13 +2630,11 @@ Heal_RemoveDamageEffect: ; 2cdc7 (b:4dc7) call Func_2c10b call ExchangeRNG ret -; 0x2ce23 PetalDance_AIEffect: ; 2ce23 (b:4e23) ld a, 120 / 2 lb de, 0, 120 jp SetExpectedAIDamage -; 0x2ce2b PetalDance_MultiplierEffect: ; 2ce2b (b:4e2b) ld hl, 40 @@ -2754,13 +2651,11 @@ PetalDance_MultiplierEffect: ; 2ce2b (b:4e2b) call ConfusionEffect call SwapTurn ret -; 0x2ce4b PoisonWhip_AIEffect: ; 2ce4b (b:4e4b) ld a, 10 lb de, 10, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2ce53 SolarPower_CheckUse: ; 2ce53 (b:4e53) ldh a, [hTempPlayAreaLocation_ff9d] @@ -2794,7 +2689,6 @@ SolarPower_CheckUse: ; 2ce53 (b:4e53) ldtx hl, NotAffectedByPoisonSleepParalysisOrConfusionText scf ret -; 0x2ce82 SolarPower_RemoveStatusEffect: ; 2ce82 (b:4e82) ld a, ATK_ANIM_HEAL_BOTH_SIDES @@ -2820,7 +2714,6 @@ SolarPower_RemoveStatusEffect: ; 2ce82 (b:4e82) ld [hl], NO_STATUS bank1call DrawDuelHUDs ret -; 0x2ceb0 VenusaurMegaDrainEffect: ; 2ceb0 (b:4eb0) ld hl, wDealtDamage @@ -2839,7 +2732,6 @@ VenusaurMegaDrainEffect: ; 2ceb0 (b:4eb0) ld d, h call ApplyAndAnimateHPRecovery ret -; 0x2cec8 ; applies the damage bonus for attacks that get bonus ; from extra Water energy cards. @@ -2899,18 +2791,15 @@ ApplyExtraWaterEnergyDamageBonus: ; 2cec8 (b:4ec8) ld [wAIMinDamage], a ld [wAIMaxDamage], a ret -; 0x2cf05 OmastarWaterGunEffect: ; 2cf05 (b:4f05) lb bc, 1, 1 jr ApplyExtraWaterEnergyDamageBonus -; 0x2cf0a OmastarSpikeCannon_AIEffect: ; 2cf0a (b:4f0a) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2cf12 OmastarSpikeCannon_MultiplierEffect: ; 2cf12 (b:4f12) ld hl, 30 @@ -2924,17 +2813,14 @@ OmastarSpikeCannon_MultiplierEffect: ; 2cf12 (b:4f12) call ATimes10 call SetDefiniteDamage ; 3 * 10 * heads ret -; 0x2cf2a ClairvoyanceEffect: ; 2cf2a (b:4f2a) scf ret -; 0x2cf2c OmanyteWaterGunEffect: ; 2cf2c (b:4f2c) lb bc, 1, 0 jp ApplyExtraWaterEnergyDamageBonus -; 0x2cf32 WartortleWithdrawEffect: ; 2cf32 (b:4f32) ldtx de, IfHeadsNoDamageNextTurnText @@ -2945,29 +2831,24 @@ WartortleWithdrawEffect: ; 2cf32 (b:4f32) ld a, SUBSTATUS1_NO_DAMAGE_10 call ApplySubstatus1ToDefendingCard ret -; 0x2cf46 RainDanceEffect: ; 2cf46 (b:4f46) scf ret -; 0x2cf48 HydroPumpEffect: ; 2cf48 (b:4f48) lb bc, 3, 0 jp ApplyExtraWaterEnergyDamageBonus -; 0x2cf4e KinglerFlail_AIEffect: ; 2cf4e (b:4f4e) call KinglerFlail_HPCheck jp SetDefiniteAIDamage -; 0x2cf54 KinglerFlail_HPCheck: ; 2cf54 (b:4f54) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call SetDefiniteDamage ret -; 0x2cf5d ; returns carry if no cards in Deck ; or if Play Area is full already. @@ -2980,7 +2861,6 @@ KrabbyCallForFamily_CheckDeckAndPlayArea: ; 2cf5d (b:4f5d) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2cf6d KrabbyCallForFamily_PlayerSelectEffect: ; 2cf6d (b:4f6d) ld a, $ff @@ -3043,7 +2923,6 @@ KrabbyCallForFamily_PlayerSelectEffect: ; 2cf6d (b:4f6d) ldh [hTemp_ffa0], a or a ret -; 0x2cfdf KrabbyCallForFamily_AISelectEffect: ; 2cfdf (b:4fdf) call CreateDeckCardList @@ -3058,7 +2937,6 @@ KrabbyCallForFamily_AISelectEffect: ; 2cfdf (b:4fdf) cp KRABBY jr nz, .loop_deck ret ; Krabby found -; 0x2cfca KrabbyCallForFamily_PutInPlayAreaEffect: ; 2cfca (b:4fca) ldh a, [hTemp_ffa0] @@ -3075,32 +2953,27 @@ KrabbyCallForFamily_PutInPlayAreaEffect: ; 2cfca (b:4fca) .shuffle call Func_2c0bd ret -; 0x2cfff MagikarpFlail_AIEffect: ; 2cfff (b:4fff) call MagikarpFlail_HPCheck jp SetDefiniteAIDamage -; 0x2d005 MagikarpFlail_HPCheck: ; 2d005 (b:5005) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call SetDefiniteDamage ret -; 0x2d00e HeadacheEffect: ; 2d00e (b:500e) ld a, DUELVARS_ARENA_CARD_SUBSTATUS3 call GetNonTurnDuelistVariable set SUBSTATUS3_HEADACHE, [hl] ret -; 0x2d016 PsyduckFurySwipes_AIEffect: ; 2d016 (b:5016) ld a, 30 / 2 lb de, 0, 30 jp SetExpectedAIDamage -; 0x2d01e PsyduckFurySwipes_MultiplierEffect: ; 2d01e (b:501e) ld hl, 10 @@ -3111,7 +2984,6 @@ PsyduckFurySwipes_MultiplierEffect: ; 2d01e (b:501e) call ATimes10 call SetDefiniteDamage ret -; 0x2d033 GolduckHyperBeam_PlayerSelectEffect: ; 2d033 (b:5033) call SwapTurn @@ -3144,13 +3016,11 @@ GolduckHyperBeam_PlayerSelectEffect: ; 2d033 (b:5033) ldh [hTemp_ffa0], a or a ret -; 0x2d065 GolduckHyperBeam_AISelectEffect: ; 2d065 (b:5065) call AIPickEnergyCardToDiscardFromDefendingPokemon ldh [hTemp_ffa0], a ret -; 0x2d06b GolduckHyperBeam_DiscardEffect: ; 2d06b (b:506b) call HandleNoDamageOrEffect @@ -3169,12 +3039,10 @@ GolduckHyperBeam_DiscardEffect: ; 2d06b (b:506b) ld [hl], LAST_TURN_EFFECT_DISCARD_ENERGY call SwapTurn ret -; 0x2d085 SeadraWaterGunEffect: ; 2d085 (b:5085) lb bc, 1, 1 jp ApplyExtraWaterEnergyDamageBonus -; 0x2d08b SeadraAgilityEffect: ; 2d08b (b:508b) ldtx de, IfHeadsDoNotReceiveDamageOrEffectText @@ -3185,13 +3053,11 @@ SeadraAgilityEffect: ; 2d08b (b:508b) ld a, SUBSTATUS1_AGILITY call ApplySubstatus1ToDefendingCard ret -; 0x2d09d ShellderSupersonicEffect: ; 2d09d (b:509d) call Confusion50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2d0a4 HideInShellEffect: ; 2d0a4 (b:50a4) ldtx de, IfHeadsNoDamageNextTurnText @@ -3202,13 +3068,11 @@ HideInShellEffect: ; 2d0a4 (b:50a4) ld a, SUBSTATUS1_NO_DAMAGE_11 call ApplySubstatus1ToDefendingCard ret -; 0x2d0b8 VaporeonQuickAttack_AIEffect: ; 2d0b8 (b:50b8) ld a, (10 + 30) / 2 lb de, 10, 30 jp SetExpectedAIDamage -; 0x2d0c0 VaporeonQuickAttack_DamageBoostEffect: ; 2d0c0 (b:50c0) ld hl, 20 @@ -3219,12 +3083,10 @@ VaporeonQuickAttack_DamageBoostEffect: ; 2d0c0 (b:50c0) ld a, 20 call AddToDamage ret -; 0x2d0d3 VaporeonWaterGunEffect: ; 2d0d3 (b:50d3) lb bc, 2, 1 jp ApplyExtraWaterEnergyDamageBonus -; 0x2d0d9 ; returns carry if Arena card has no Water Energy attached ; or if it doesn't have any damage counters. @@ -3239,7 +3101,6 @@ StarmieRecover_CheckEnergyHP: ; 2d0d9 (b:50d9) ldtx hl, NoDamageCountersText cp 10 ret ; return carry if no damage -; 0x2d0f0 StarmieRecover_PlayerSelectEffect: ; 2d0f0 (b:50f0) ld a, TYPE_ENERGY_WATER @@ -3252,7 +3113,6 @@ StarmieRecover_PlayerSelectEffect: ; 2d0f0 (b:50f0) ldh a, [hTempCardIndex_ff98] ldh [hTemp_ffa0], a ; store card chosen ret -; 0x2d103 StarmieRecover_AISelectEffect: ; 2d103 (b:5103) ld a, TYPE_ENERGY_WATER @@ -3260,13 +3120,11 @@ StarmieRecover_AISelectEffect: ; 2d103 (b:5103) ld a, [wDuelTempList] ; pick first card ldh [hTemp_ffa0], a ret -; 0x2d10e StarmieRecover_DiscardEffect: ; 2d10e (b:510e) ldh a, [hTemp_ffa0] call PutCardInDiscardPile ret -; 0x2d114 StarmieRecover_HealEffect: ; 2d114 (b:5114) ld e, PLAY_AREA_ARENA @@ -3275,7 +3133,6 @@ StarmieRecover_HealEffect: ; 2d114 (b:5114) ld d, 0 call ApplyAndAnimateHPRecovery ret -; 0x2d120 SquirtleWithdrawEffect: ; 2d120 (b:5120) ldtx de, IfHeadsNoDamageNextTurnText @@ -3286,25 +3143,21 @@ SquirtleWithdrawEffect: ; 2d120 (b:5120) ld a, SUBSTATUS1_NO_DAMAGE_10 call ApplySubstatus1ToDefendingCard ret -; 0x2d134 HorseaSmokescreenEffect: ; 2d134 (b:5134) ld a, SUBSTATUS2_SMOKESCREEN call ApplySubstatus2ToDefendingCard ret -; 0x2d13a TentacruelSupersonicEffect: ; 2d13a (b:513a) call Confusion50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2d141 JellyfishSting_AIEffect: ; 2d141 (b:5141) ld a, 10 lb de, 10, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2d149 ; returns carry if Defending Pokemon has no attacks PoliwhirlAmnesia_CheckAttacks: ; 2d149 (b:5149) @@ -3328,23 +3181,19 @@ PoliwhirlAmnesia_CheckAttacks: ; 2d149 (b:5149) call SwapTurn or a ret -; 0x2d16f PoliwhirlAmnesia_PlayerSelectEffect: ; 2d16f (b:516f) call PlayerPickAttackForAmnesia ret -; 0x2d173 PoliwhirlAmnesia_AISelectEffect: ; 2d173 (b:5173) call AIPickAttackForAmnesia ldh [hTemp_ffa0], a ret -; 0x2d179 PoliwhirlAmnesia_DisableEffect: ; 2d179 (b:5179) call ApplyAmnesiaToAttack ret -; 0x2d17d PlayerPickAttackForAmnesia: ; 2d17d (b:517d) ldtx hl, ChooseAttackOpponentWillNotBeAbleToUseText @@ -3353,7 +3202,6 @@ PlayerPickAttackForAmnesia: ; 2d17d (b:517d) ld a, e ldh [hTemp_ffa0], a ret -; 0x2d18a ; applies the Amnesia effect on the defending Pokemon, ; for the attack index in hTemp_ffa0. @@ -3390,13 +3238,11 @@ ApplyAmnesiaToAttack: ; 2d18a (b:518a) call DrawWideTextBox_WaitForInput call SwapTurn ret -; 0x2d1c0 PoliwhirlDoubleslap_AIEffect: ; 2d1c0 (b:51c0) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2d1c8 PoliwhirlDoubleslap_MultiplierEffect: ; 2d1c8 (b:51c8) ld hl, 30 @@ -3410,12 +3256,10 @@ PoliwhirlDoubleslap_MultiplierEffect: ; 2d1c8 (b:51c8) call ATimes10 call SetDefiniteDamage ret -; 0x2d1e0 PoliwrathWaterGunEffect: ; 2d1e0 (b:51e0) lb bc, 2, 1 jp ApplyExtraWaterEnergyDamageBonus -; 0x2d1e6 Whirlpool_PlayerSelectEffect: ; 2d1e6 (b:51e6) call SwapTurn @@ -3441,13 +3285,11 @@ Whirlpool_PlayerSelectEffect: ; 2d1e6 (b:51e6) ld a, $ff ldh [hTemp_ffa0], a ret -; 0x2d20e Whirlpool_AISelectEffect: ; 2d20e (b:520e) call AIPickEnergyCardToDiscardFromDefendingPokemon ldh [hTemp_ffa0], a ret -; 0x2d214 Whirlpool_DiscardEffect: ; 2d214 (b:5214) call HandleNoDamageOrEffect @@ -3465,12 +3307,10 @@ Whirlpool_DiscardEffect: ; 2d214 (b:5214) ; ld [hl], LAST_TURN_EFFECT_DISCARD_ENERGY call SwapTurn ret -; 0x2d227 PoliwagWaterGunEffect: ; 2d227 (b:5227) lb bc, 1, 0 jp ApplyExtraWaterEnergyDamageBonus -; 0x2d22d ClampEffect: ; 2d22d (b:522d) ld a, ATK_ANIM_HIT_EFFECT @@ -3484,13 +3324,11 @@ ClampEffect: ; 2d22d (b:522d) call SetDefiniteDamage call SetWasUnsuccessful ret -; 0x2d246 CloysterSpikeCannon_AIEffect: ; 2d246 (b:5246) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2d24e CloysterSpikeCannon_MultiplierEffect: ; 2d24e (b:524e) ld hl, 30 @@ -3504,14 +3342,12 @@ CloysterSpikeCannon_MultiplierEffect: ; 2d24e (b:524e) call ATimes10 call SetDefiniteDamage ret -; 0x2d266 Blizzard_BenchDamage50PercentEffect: ; 2d266 (b:5266) ldtx de, DamageToOppBenchIfHeadsDamageToYoursIfTailsText call TossCoin_BankB ldh [hTemp_ffa0], a ; store coin result ret -; 0x2d26f Blizzard_BenchDamageEffect: ; 2d26f (b:526f) ldh a, [hTemp_ffa0] @@ -3531,7 +3367,6 @@ Blizzard_BenchDamageEffect: ; 2d26f (b:526f) call DealDamageToAllBenchedPokemon call SwapTurn ret -; 0x2d28b ; return carry if can use Cowardice Cowardice_Check: ; 2d28b (b:528b) @@ -3556,7 +3391,6 @@ Cowardice_Check: ; 2d28b (b:528b) or a ret -; 0x2d2ae Cowardice_PlayerSelectEffect: ; 2d2ae (b:52ae) ldh a, [hTemp_ffa0] @@ -3569,7 +3403,6 @@ Cowardice_PlayerSelectEffect: ; 2d2ae (b:52ae) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hAIPkmnPowerEffectParam], a ret -; 0x2d2c3 Cowardice_RemoveFromPlayAreaEffect: ; 2d2c3 (b:52c3) ldh a, [hTemp_ffa0] @@ -3603,17 +3436,14 @@ Cowardice_RemoveFromPlayAreaEffect: ; 2d2c3 (b:52c3) xor a ld [wDuelDisplayedScreen], a ret -; 0x2d2eb LaprasWaterGunEffect: ; 2d2eb (b:52eb) lb bc, 1, 0 jp ApplyExtraWaterEnergyDamageBonus -; 0x2d2f1 Quickfreeze_InitialEffect: ; 2d2f1 (b:52f1) scf ret -; 0x2d2f3 Quickfreeze_Paralysis50PercentEffect: ; 2d2f3 (b:52f3) ldtx de, ParalysisCheckText @@ -3642,13 +3472,11 @@ Quickfreeze_Paralysis50PercentEffect: ; 2d2f3 (b:52f3) bank1call Func_1bca call c, WaitForWideTextBoxInput ret -; 0x2d329 IceBreath_ZeroDamage: ; 2d329 (b:5329) xor a call SetDefiniteDamage ret -; 0x2d32e IceBreath_RandomPokemonDamageEffect: ; 2d32e (b:532e) call SwapTurn @@ -3658,7 +3486,6 @@ IceBreath_RandomPokemonDamageEffect: ; 2d32e (b:532e) call DealDamageToPlayAreaPokemon_RegularAnim call SwapTurn ret -; 0x2d33f FocusEnergyEffect: ; 2d33f (b:533f) ld a, [wTempTurnDuelistCardID] @@ -3667,7 +3494,6 @@ FocusEnergyEffect: ; 2d33f (b:533f) ld a, SUBSTATUS1_NEXT_TURN_DOUBLE_DAMAGE call ApplySubstatus1ToDefendingCard ret -; 0x2d34b PlayerPickFireEnergyCardToDiscard: ; 2d34b (b:534b) call CreateListOfFireEnergyAttachedToArena @@ -3677,14 +3503,12 @@ PlayerPickFireEnergyCardToDiscard: ; 2d34b (b:534b) ldh a, [hTempCardIndex_ff98] ldh [hTempList], a ret -; 0x2d35a AIPickFireEnergyCardToDiscard: ; 2d35a (b:535a) call CreateListOfFireEnergyAttachedToArena ld a, [wDuelTempList] ldh [hTempList], a ; pick first in list ret -; 0x2d363 ; returns carry if Arena card has no Fire Energy cards ArcanineFlamethrower_CheckEnergy: ; 2d363 (b:5363) @@ -3694,35 +3518,29 @@ ArcanineFlamethrower_CheckEnergy: ; 2d363 (b:5363) ldtx hl, NotEnoughFireEnergyText cp 1 ret -; 0x2d371 ArcanineFlamethrower_PlayerSelectEffect: ; 2d371 (b:5371) call PlayerPickFireEnergyCardToDiscard ret -; 0x2d375 ArcanineFlamethrower_AISelectEffect: ; 2d375 (b:5375) call AIPickFireEnergyCardToDiscard ret -; 0x2d379 ArcanineFlamethrower_DiscardEffect: ; 2d379 (b:5379) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d37f TakeDownEffect: ; 2d37f (b:537f) ld a, 30 call DealRecoilDamageToSelf ret -; 0x2d385 ArcanineQuickAttack_AIEffect: ; 2d385 (b:5385) ld a, (10 + 30) / 2 lb de, 10, 30 jp SetExpectedAIDamage -; 0x2d38d ArcanineQuickAttack_DamageBoostEffect: ; 2d38d (b:538d) ld hl, 20 @@ -3733,7 +3551,6 @@ ArcanineQuickAttack_DamageBoostEffect: ; 2d38d (b:538d) ld a, 20 call AddToDamage ret -; 0x2d3a0 ; return carry if has less than 2 Fire Energy cards FlamesOfRage_CheckEnergy: ; 2d3a0 (b:53a0) @@ -3743,7 +3560,6 @@ FlamesOfRage_CheckEnergy: ; 2d3a0 (b:53a0) ldtx hl, NotEnoughFireEnergyText cp 2 ret -; 0x2d3ae FlamesOfRage_PlayerSelectEffect: ; 2d3ae (b:53ae) ldtx hl, ChooseAndDiscard2FireEnergyCardsText @@ -3766,14 +3582,12 @@ FlamesOfRage_PlayerSelectEffect: ; 2d3ae (b:53ae) ret nc ; return when 2 have been chosen bank1call DisplayEnergyDiscardMenu jr .loop_input -; 0x2d3d5 FlamesOfRage_AISelectEffect: ; 2d3d5 (b:53d5) call AIPickFireEnergyCardToDiscard ld a, [wDuelTempList + 1] ldh [hTempList + 1], a ret -; 0x2d3de FlamesOfRage_DiscardEffect: ; 2d3de (b:53de) ldh a, [hTempList] @@ -3781,25 +3595,21 @@ FlamesOfRage_DiscardEffect: ; 2d3de (b:53de) ldh a, [hTempList + 1] call PutCardInDiscardPile ret -; 0x2d3e9 FlamesOfRage_AIEffect: ; 2d3e9 (b:53e9) call FlamesOfRage_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2d3ef FlamesOfRage_DamageBoostEffect: ; 2d3ef (b:53ef) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call AddToDamage ret -; 0x2d3f8 RapidashStomp_AIEffect: ; 2d3f8 (b:53f8) ld a, (20 + 30) / 2 lb de, 20, 30 jp SetExpectedAIDamage -; 0x2d400 RapidashStomp_DamageBoostEffect: ; 2d400 (b:5400) ld hl, 10 @@ -3810,7 +3620,6 @@ RapidashStomp_DamageBoostEffect: ; 2d400 (b:5400) ld a, 10 call AddToDamage ret -; 0x2d413 RapidashAgilityEffect: ; 2d413 (b:5413) ldtx de, IfHeadsDoNotReceiveDamageOrEffectText @@ -3821,7 +3630,6 @@ RapidashAgilityEffect: ; 2d413 (b:5413) ld a, SUBSTATUS1_AGILITY call ApplySubstatus1ToDefendingCard ret -; 0x2d425 ; returns carry if Opponent has no Pokemon in bench NinetailsLure_CheckBench: ; 2d425 (b:5425) @@ -3830,7 +3638,6 @@ NinetailsLure_CheckBench: ; 2d425 (b:5425) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2d430 NinetailsLure_PlayerSelectEffect: ; 2d430 (b:5430) ldtx hl, SelectPkmnOnBenchToSwitchWithActiveText @@ -3844,13 +3651,11 @@ NinetailsLure_PlayerSelectEffect: ; 2d430 (b:5430) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2d449 NinetailsLure_AISelectEffect: ; 2d449 (b:5449) call GetBenchPokemonWithLowestHP ldh [hTemp_ffa0], a ret -; 0x2d44f NinetailsLure_SwitchEffect: ; 2d44f (b:544f) call SwapTurn @@ -3862,7 +3667,6 @@ NinetailsLure_SwitchEffect: ; 2d44f (b:544f) xor a ld [wDuelDisplayedScreen], a ret -; 0x2d463 ; return carry if no Fire energy cards FireBlast_CheckEnergy: ; 2d463 (b:5463) @@ -3872,23 +3676,19 @@ FireBlast_CheckEnergy: ; 2d463 (b:5463) ld a, [wAttachedEnergies] cp 1 ret -; 0x2d471 FireBlast_PlayerSelectEffect: ; 2d471 (b:5471) call PlayerPickFireEnergyCardToDiscard ret -; 0x2d475 FireBlast_AISelectEffect: ; 2d475 (b:5475) call AIPickFireEnergyCardToDiscard ret -; 0x2d479 FireBlast_DiscardEffect: ; 2d479 (b:5479) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d47f ; return carry if no Fire energy cards Ember_CheckEnergy: ; 2d47f (b:547f) @@ -3898,23 +3698,19 @@ Ember_CheckEnergy: ; 2d47f (b:547f) ld a, [wAttachedEnergies] cp 1 ret -; 0x2d48d Ember_PlayerSelectEffect: ; 2d48d (b:548d) call PlayerPickFireEnergyCardToDiscard ret -; 0x2d491 Ember_AISelectEffect: ; 2d491 (b:5491) call AIPickFireEnergyCardToDiscard ret -; 0x2d495 Ember_DiscardEffect: ; 2d495 (b:5495) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d49b ; return carry if no Fire energy cards Wildfire_CheckEnergy: ; 2d49b (b:549b) @@ -3924,7 +3720,6 @@ Wildfire_CheckEnergy: ; 2d49b (b:549b) ld a, [wAttachedEnergies] cp 1 ret -; 0x2d4a9 Wildfire_PlayerSelectEffect: ; 2d4a9 (b:54a9) ldtx hl, DiscardOppDeckAsManyFireEnergyCardsText @@ -3962,14 +3757,12 @@ Wildfire_PlayerSelectEffect: ; 2d4a9 (b:54a9) ret nz scf ret -; 0x2d4dd Wildfire_AISelectEffect: ; 2d4dd (b:54dd) ; AI always chooses 0 cards to discard xor a ldh [hTempList], a ret -; 0x2d4e1 Wildfire_DiscardEnergyEffect: ; 2d4e1 (b:54e1) call CreateListOfFireEnergyAttachedToArena @@ -3990,7 +3783,6 @@ Wildfire_DiscardEnergyEffect: ; 2d4e1 (b:54e1) dec c jr nz, .loop_discard ret -; 0x2d4f4 Wildfire_DiscardDeckEffect: ; 2d4f4 (b:54f4) ldh a, [hTemp_ffa0] @@ -4025,13 +3817,11 @@ Wildfire_DiscardDeckEffect: ; 2d4f4 (b:54f4) call DrawWideTextBox_PrintText call SwapTurn ret -; 0x2d523 Moltres1DiveBomb_AIEffect: ; 2d523 (b:5523) ld a, 80 / 2 lb de, 0, 80 jp SetExpectedAIDamage -; 0x2d52b Moltres1DiveBomb_Success50PercentEffect: ; 2d52b (b:552b) ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText @@ -4046,13 +3836,11 @@ Moltres1DiveBomb_Success50PercentEffect: ; 2d52b (b:552b) ld a, ATK_ANIM_DIVE_BOMB ld [wLoadedAttackAnimation], a ret -; 0x2d541 FlareonQuickAttack_AIEffect: ; 2d541 (b:5541) ld a, (10 + 30) / 2 lb de, 10, 30 jp SetExpectedAIDamage -; 0x2d549 FlareonQuickAttack_DamageBoostEffect: ; 2d549 (b:5549) ld hl, 20 @@ -4063,7 +3851,6 @@ FlareonQuickAttack_DamageBoostEffect: ; 2d549 (b:5549) ld a, 20 call AddToDamage ret -; 0x2d55c ; return carry if no Fire Energy attached FlareonFlamethrower_CheckEnergy: ; 2d55c (b:555c) @@ -4073,23 +3860,19 @@ FlareonFlamethrower_CheckEnergy: ; 2d55c (b:555c) ld a, [wAttachedEnergies] cp 1 ret -; 0x2d56a FlareonFlamethrower_PlayerSelectEffect: ; 2d56a (b:556a) call PlayerPickFireEnergyCardToDiscard ret -; 0x2d56e FlareonFlamethrower_AISelectEffect: ; 2d56e (b:556e) call AIPickFireEnergyCardToDiscard ret -; 0x2d572 FlareonFlamethrower_DiscardEffect: ; 2d572 (b:5572) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d578 ; return carry if no Fire Energy attached MagmarFlamethrower_CheckEnergy: ; 2d578 (b:5578) @@ -4099,35 +3882,29 @@ MagmarFlamethrower_CheckEnergy: ; 2d578 (b:5578) ld a, [wAttachedEnergies] cp 1 ret -; 0x2d586 MagmarFlamethrower_PlayerSelectEffect: ; 2d586 (b:5586) call PlayerPickFireEnergyCardToDiscard ret -; 0x2d58a MagmarFlamethrower_AISelectEffect: ; 2d58a (b:558a) call AIPickFireEnergyCardToDiscard ret -; 0x2d58e MagmarFlamethrower_DiscardEffect: ; 2d58e (b:558e) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d594 MagmarSmokescreenEffect: ; 2d594 (b:5594) ld a, SUBSTATUS2_SMOKESCREEN call ApplySubstatus2ToDefendingCard ret -; 0x2d59a MagmarSmog_AIEffect: ; 2d59a (b:559a) ld a, 5 lb de, 0, 10 jp UpdateExpectedAIDamage_AccountForPoison -; 0x2d5a2 ; return carry if no Fire Energy attached CharmeleonFlamethrower_CheckEnergy: ; 2d5a2 (b:55a2) @@ -4137,28 +3914,23 @@ CharmeleonFlamethrower_CheckEnergy: ; 2d5a2 (b:55a2) ld a, [wAttachedEnergies] cp 1 ret -; 0x2d5b0 CharmeleonFlamethrower_PlayerSelectEffect: ; 2d5b0 (b:55b0) call PlayerPickFireEnergyCardToDiscard ret -; 0x2d5b4 CharmeleonFlamethrower_AISelectEffect: ; 2d5b4 (b:55b4) call AIPickFireEnergyCardToDiscard ret -; 0x2d5b8 CharmeleonFlamethrower_DiscardEffect: ; 2d5b8 (b:55b8) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d5be EnergyBurnEffect: ; 2d5be (b:55be) scf ret -; 0x2d5c0 ; return carry if has less than 2 Fire Energy cards FireSpin_CheckEnergy: ; 2d5c0 (b:55c0) @@ -4168,7 +3940,6 @@ FireSpin_CheckEnergy: ; 2d5c0 (b:55c0) ldtx hl, NotEnoughEnergyCardsText cp 2 ret -; 0x2d5cd FireSpin_PlayerSelectEffect: ; 2d5cd (b:55cd) ldtx hl, ChooseAndDiscard2EnergyCardsText @@ -4203,7 +3974,6 @@ FireSpin_PlayerSelectEffect: ; 2d5cd (b:55cd) ; return when 2 have been chosen or a ret -; 0x2d606 FireSpin_AISelectEffect: ; 2d606 (b:5606) xor a ; PLAY_AREA_ARENA @@ -4214,7 +3984,6 @@ FireSpin_AISelectEffect: ; 2d606 (b:5606) ld a, [hl] ldh [hTempList + 1], a ret -; 0x2d614 FireSpin_DiscardEffect: ; 2d614 (b:5614) ld hl, hTempList @@ -4223,7 +3992,6 @@ FireSpin_DiscardEffect: ; 2d614 (b:5614) ld a, [hli] call PutCardInDiscardPile ret -; 0x2d620 ; returns carry if Pkmn Power cannot be used ; or if Arena card is not Charizard. @@ -4245,19 +4013,16 @@ EnergyBurnCheck_Unreferenced: ; 2d620 (b:5620) .not_charizard scf ret -; 0x2d638 FlareonRage_AIEffect: ; 2d638 (b:5638) call FlareonRage_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2d63e FlareonRage_DamageBoostEffect: ; 2d63e (b:563e) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call AddToDamage ret -; 0x2d647 MixUpEffect: ; 2d647 (b:5647) call SwapTurn @@ -4316,7 +4081,6 @@ MixUpEffect: ; 2d647 (b:5647) .done call SwapTurn ret -; 0x2d69a ; returns carry if card index in a is Pkmn card .CheckIfCardIsPkmnCard: ; 2d69a (b:569a) @@ -4324,13 +4088,11 @@ MixUpEffect: ; 2d647 (b:5647) ld a, [wLoadedCard2Type] cp TYPE_ENERGY ret -; 0x2d6a3 DancingEmbers_AIEffect: ; 2d6a3 (b:56a3) ld a, 80 / 2 lb de, 0, 80 jp SetExpectedAIDamage -; 0x2d6ab DancingEmbers_MultiplierEffect: ; 2d6ab (b:56ab) ld hl, 10 @@ -4341,12 +4103,10 @@ DancingEmbers_MultiplierEffect: ; 2d6ab (b:56ab) call ATimes10 call SetDefiniteDamage ret -; 0x2d6c0 Firegiver_InitialEffect: ; 2d6c0 (b:56c0) scf ret -; 0x2d6c2 Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2) ; fill wDuelTempList with all Fire Energy card @@ -4470,13 +4230,11 @@ Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2) call DrawWideTextBox_WaitForInput call Func_2c0bd ret -; 0x2d76e Moltres2DiveBomb_AIEffect: ; 2d76e (b:576e) ld a, 70 / 2 lb de, 0, 70 jp SetExpectedAIDamage -; 0x2d776 Moltres2DiveBomb_Success50PercentEffect: ; 2d776 (b:5776) ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText @@ -4491,7 +4249,6 @@ Moltres2DiveBomb_Success50PercentEffect: ; 2d776 (b:5776) ld a, ATK_ANIM_DIVE_BOMB ld [wLoadedAttackAnimation], a ret -; 0x2d78c ; output in de the number of energy cards ; attached to the Defending Pokemon times 10. @@ -4532,7 +4289,6 @@ GetEnergyAttachedMultiplierDamage: ; 2d78c (b:578c) ld e, l ld d, h ret -; 0x2d7bc ; draws list of Energy Cards in Discard Pile ; for Player to select from. @@ -4584,7 +4340,6 @@ HandleEnergyCardsInDiscardPileSelection: ; 2d7bc (b:57bc) ld [hl], $ff or a ret -; 0x2d7fc ; returns carry if Pkmn Power cannot be used, and ; sets the correct text in hl for failure. @@ -4624,7 +4379,6 @@ Curse_CheckDamageAndBench: ; 2d7fc (b:57fc) .set_carry scf ret -; 0x2d834 Curse_PlayerSelectEffect: ; 2d834 (b:5834) ldtx hl, ProcedureForCurseText @@ -4716,7 +4470,6 @@ Curse_PlayerSelectEffect: ; 2d834 (b:5834) call SwapTurn scf ret -; 0x2d8bb Curse_TransferDamageEffect: ; 2d8bb (b:58bb) ; set Pkmn Power as used @@ -4764,7 +4517,6 @@ Curse_TransferDamageEffect: ; 2d8bb (b:58bb) call ExchangeRNG bank1call Func_6e49 ret -; 0x2d903 GengarDarkMind_PlayerSelectEffect: ; 2d903 (b:5903) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -4790,7 +4542,6 @@ GengarDarkMind_PlayerSelectEffect: ; 2d903 (b:5903) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2d92a GengarDarkMind_AISelectEffect: ; 2d92a (b:592a) ld a, $ff @@ -4803,7 +4554,6 @@ GengarDarkMind_AISelectEffect: ; 2d92a (b:592a) call GetBenchPokemonWithLowestHP ldh [hTemp_ffa0], a ret -; 0x2d93c GengarDarkMind_DamageBenchEffect: ; 2d93c (b:593c) ldh a, [hTemp_ffa0] @@ -4815,13 +4565,11 @@ GengarDarkMind_DamageBenchEffect: ; 2d93c (b:593c) call DealDamageToPlayAreaPokemon_RegularAnim call SwapTurn ret -; 0x2d94f SleepingGasEffect: ; 2d94f (b:594f) call Sleep50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2d956 DestinyBond_CheckEnergy: ; 2d956 (b:5956) ld e, PLAY_AREA_ARENA @@ -4830,7 +4578,6 @@ DestinyBond_CheckEnergy: ; 2d956 (b:5956) ldtx hl, NotEnoughPsychicEnergyText cp 1 ret -; 0x2d964 DestinyBond_PlayerSelectEffect: ; 2d964 (b:5964) ; handle input and display of Energy card list @@ -4843,7 +4590,6 @@ DestinyBond_PlayerSelectEffect: ; 2d964 (b:5964) ldh a, [hTempCardIndex_ff98] ldh [hTempList], a ret -; 0x2d976 DestinyBond_AISelectEffect: ; 2d976 (b:5976) ; pick first card in list @@ -4852,32 +4598,27 @@ DestinyBond_AISelectEffect: ; 2d976 (b:5976) ld a, [wDuelTempList] ldh [hTempList], a ret -; 0x2d981 DestinyBond_DiscardEffect: ; 2d981 (b:5981) ldh a, [hTempList] call PutCardInDiscardPile ret -; 0x2d987 DestinyBond_DestinyBondEffect: ; 2d987 (b:5987) ld a, SUBSTATUS1_DESTINY_BOND call ApplySubstatus1ToDefendingCard ret -; 0x2d98d ; returns carry if no Energy cards in Discard Pile. EnergyConversion_CheckEnergy: ; 2d98d (b:598d) call CreateEnergyCardListFromDiscardPile_AllEnergy ldtx hl, ThereAreNoEnergyCardsInDiscardPileText ret -; 0x2d994 EnergyConversion_PlayerSelectEffect: ; 2d994 (b:5994) ldtx hl, Choose2EnergyCardsFromDiscardPileForHandText call HandleEnergyCardsInDiscardPileSelection ret -; 0x2d99b EnergyConversion_AISelectEffect: ; 2d99b (b:599b) call CreateEnergyCardListFromDiscardPile_AllEnergy @@ -4897,7 +4638,6 @@ EnergyConversion_AISelectEffect: ; 2d99b (b:599b) ld a, $ff ld [de], a ret -; 0x2d9b4 EnergyConversion_AddToHandEffect: ; 2d9b4 (b:59b4) ; damage itself @@ -4924,7 +4664,6 @@ EnergyConversion_AddToHandEffect: ; 2d9b4 (b:59b4) ret c bank1call Func_4b38 ret -; 0x2d9d6 ; return carry if Defending Pokemon is not asleep DreamEaterEffect: ; 2d9d6 (b:59d6) @@ -4937,12 +4676,10 @@ DreamEaterEffect: ; 2d9d6 (b:59d6) ldtx hl, OpponentIsNotAsleepText scf ret -; 0x2d9e5 TransparencyEffect: ; 2d9e5 (b:59e5) scf ret -; 0x2d9e7 ; returns carry if neither the Turn Duelist or ; the non-Turn Duelist have any deck cards. @@ -4961,7 +4698,6 @@ Prophecy_CheckDeck: ; 2d9e7 (b:59e7) .no_carry or a ret -; 0x2da00 Prophecy_PlayerSelectEffect: ; 2da00 (b:5a00) ldtx hl, ProcedureForProphecyText @@ -4996,7 +4732,6 @@ Prophecy_PlayerSelectEffect: ; 2da00 (b:5a00) jr nc, .select_deck ; no cards, go back to deck selection call HandleProphecyScreen ret -; 0x2da3c Prophecy_AISelectEffect: ; 2da3c (b:5a3c) ; AI doesn't ever choose this attack @@ -5004,7 +4739,6 @@ Prophecy_AISelectEffect: ; 2da3c (b:5a3c) ld a, $ff ldh [hTemp_ffa0], a ret -; 0x2da41 Prophecy_ReorderDeckEffect: ; 2da41 (b:5a41) ld hl, hTempList @@ -5048,7 +4782,6 @@ Prophecy_ReorderDeckEffect: ; 2da41 (b:5a41) ldtx hl, ExchangedCardsInDuelistsHandText call DrawWideTextBox_WaitForInput ret -; 0x2da76 ; draw and handle Player selection for reordering ; the top 3 cards of Deck. @@ -5194,7 +4927,6 @@ HandleProphecyScreen: ; 2da76 (b:5a76) ld [hl], $00 bank1call Func_5744 jr .loop_selection -; 0x2db2b HypnoDarkMind_PlayerSelectEffect: ; 2db2b (b:5b2b) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -5220,7 +4952,6 @@ HypnoDarkMind_PlayerSelectEffect: ; 2db2b (b:5b2b) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2db52 HypnoDarkMind_AISelectEffect: ; 2db52 (b:5b52) ld a, $ff @@ -5233,7 +4964,6 @@ HypnoDarkMind_AISelectEffect: ; 2db52 (b:5b52) call GetBenchPokemonWithLowestHP ldh [hTemp_ffa0], a ret -; 0x2db64 HypnoDarkMind_DamageBenchEffect: ; 2db64 (b:5b64) ldh a, [hTemp_ffa0] @@ -5245,17 +4975,14 @@ HypnoDarkMind_DamageBenchEffect: ; 2db64 (b:5b64) call DealDamageToPlayAreaPokemon_RegularAnim call SwapTurn ret -; 0x2db77 InvisibleWallEffect: ; 2db77 (b:5b77) scf ret -; 0x2db79 MrMimeMeditate_AIEffect: ; 2db79 (b:5b79) call MrMimeMeditate_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2db7f MrMimeMeditate_DamageBoostEffect: ; 2db7f (b:5b7f) ; add damage counters of Defending card to damage @@ -5265,7 +4992,6 @@ MrMimeMeditate_DamageBoostEffect: ; 2db7f (b:5b7f) call SwapTurn call AddToDamage ret -; 0x2db8e ; returns carry if Damage Swap cannot be used. DamageSwap_CheckDamage: ; 2db8e (b:5b8e) @@ -5280,7 +5006,6 @@ DamageSwap_CheckDamage: ; 2db8e (b:5b8e) ldtx hl, NoPokemonWithDamageCountersText scf ret -; 0x2dba2 DamageSwap_SelectAndSwapEffect: ; 2dba2 (b:5ba2) ld a, DUELVARS_DUELIST_TYPE @@ -5372,7 +5097,6 @@ DamageSwap_SelectAndSwapEffect: ; 2dba2 (b:5ba2) .no_damage call Func_3794 jr .loop_input_first -; 0x2dc27 ; tries to give damage counter to hPlayAreaEffectTarget, ; and if successful updates UI screen. @@ -5382,7 +5106,6 @@ DamageSwap_SwapEffect: ; 2dc27 (b:5c27) bank1call PrintPlayAreaCardList_EnableLCD or a ret -; 0x2dc30 ; tries to give the damage counter to the target ; chosen by the Player (hPlayAreaEffectTarget). @@ -5407,7 +5130,6 @@ TryGiveDamageCounter_DamageSwap: ; 2dc30 (b:5c30) .set_carry scf ret -; 0x2dc49 PsywaveEffect: ; 2dc49 (b:5c49) call GetEnergyAttachedMultiplierDamage @@ -5416,7 +5138,6 @@ PsywaveEffect: ; 2dc49 (b:5c49) inc hl ld [hl], d ret -; 0x2dc53 ; returns carry if neither Duelist has evolved Pokemon. DevolutionBeam_CheckPlayArea: ; 2dc53 (b:5c53) @@ -5427,7 +5148,6 @@ DevolutionBeam_CheckPlayArea: ; 2dc53 (b:5c53) call SwapTurn ldtx hl, ThereAreNoStage1PokemonText ret -; 0x2dc64 ; returns carry of Player cancelled selection. ; otherwise, output in hTemp_ffa0 which Play Area @@ -5474,7 +5194,6 @@ DevolutionBeam_PlayerSelectEffect: ; 2dc64 (b:5c64) .set_carry scf ret -; 0x2dc9e DevolutionBeam_AISelectEffect: ; 2dc9e (b:5c9e) ld a, $01 @@ -5489,13 +5208,11 @@ DevolutionBeam_AISelectEffect: ; 2dc9e (b:5c9e) .found ldh [hTempPlayAreaLocation_ffa1], a ret -; 0x2dcb6 DevolutionBeam_LoadAnimation: ; 2dcb6 (b:5cb6) xor a ; ATK_ANIM_NONE ld [wLoadedAttackAnimation], a ret -; 0x2dcbb DevolutionBeam_DevolveEffect: ; 2dcbb (b:5cbb) ldh a, [hTemp_ffa0] @@ -5575,7 +5292,6 @@ DevolutionBeam_DevolveEffect: ; 2dcbb (b:5cbb) xor a ld [wDuelDisplayedScreen], a ret -; 0x2dd3b ; returns carry if Turn Duelist ; has no Stage1 or Stage2 cards in Play Area. @@ -5596,7 +5312,6 @@ CheckIfTurnDuelistHasEvolvedCards: ; 2dd3b (b:5d3b) .set_carry scf ret -; 0x2dd50 ; handles Player selection of an evolved card in Play Area. ; returns carry if Player cancelled operation. @@ -5611,7 +5326,6 @@ HandleEvolvedCardSelection: ; 2dd50 (b:5d50) or a jr z, .loop ; if Basic, loop ret -; 0x2dd62 ; finds first occurrence in Play Area ; of Stage 1 or 2 card, and outputs its @@ -5637,17 +5351,14 @@ FindFirstNonBasicCardInPlayArea: ; 2dd62 (b:5d62) ld a, b scf ret -; 0x2dd79 NeutralizingShieldEffect: ; 2dd79 (b:5d79) scf ret -; 0x2dd7b Psychic_AIEffect: ; 2dd7b (b:5d7b) call Psychic_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2dd81 Psychic_DamageBoostEffect: ; 2dd81 (b:5d81) call GetEnergyAttachedMultiplierDamage @@ -5659,7 +5370,6 @@ Psychic_DamageBoostEffect: ; 2dd81 (b:5d81) adc [hl] ld [hl], a ret -; 0x2dd8e ; return carry if no Psychic Energy attached Barrier_CheckEnergy: ; 2dd8e (b:5d8e) @@ -5669,7 +5379,6 @@ Barrier_CheckEnergy: ; 2dd8e (b:5d8e) ldtx hl, NotEnoughPsychicEnergyText cp 1 ret -; 0x2dd9c Barrier_PlayerSelectEffect: ; 2dd9c (b:5d9c) ld a, TYPE_ENERGY_PSYCHIC @@ -5681,7 +5390,6 @@ Barrier_PlayerSelectEffect: ; 2dd9c (b:5d9c) ldh a, [hTempCardIndex_ff98] ldh [hTemp_ffa0], a ret -; 0x2ddae Barrier_AISelectEffect: ; 2ddae (b:5dae) ; AI picks the first energy in list @@ -5690,31 +5398,26 @@ Barrier_AISelectEffect: ; 2ddae (b:5dae) ld a, [wDuelTempList] ldh [hTemp_ffa0], a ret -; 0x2ddb9 Barrier_DiscardEffect: ; 2ddb9 (b:5db9) ldh a, [hTemp_ffa0] call PutCardInDiscardPile ret -; 0x2ddbf Barrier_BarrierEffect: ; 2ddbf (b:5dbf) ld a, SUBSTATUS1_BARRIER call ApplySubstatus1ToDefendingCard ret -; 0x2ddc5 Mewtwo3EnergyAbsorption_CheckDiscardPile: ; 2ddc5 (b:5dc5) call CreateEnergyCardListFromDiscardPile_AllEnergy ldtx hl, ThereAreNoEnergyCardsInDiscardPileText ret -; 0x2ddcc Mewtwo3EnergyAbsorption_PlayerSelectEffect: ; 2ddcc (b:5dcc) ldtx hl, Choose2EnergyCardsFromDiscardPileToAttachText call HandleEnergyCardsInDiscardPileSelection ret -; 0x2ddd3 Mewtwo3EnergyAbsorption_AISelectEffect: ; 2ddd3 (b:5dd3) ; AI picks first 2 energy cards @@ -5734,7 +5437,6 @@ Mewtwo3EnergyAbsorption_AISelectEffect: ; 2ddd3 (b:5dd3) ld a, $ff ; terminating byte ld [de], a ret -; 0x2ddec Mewtwo3EnergyAbsorption_AddToHandEffect: ; 2ddec (b:5dec) ld hl, hTempList @@ -5748,19 +5450,16 @@ Mewtwo3EnergyAbsorption_AddToHandEffect: ; 2ddec (b:5dec) ld [hl], CARD_LOCATION_ARENA pop hl jr .loop -; 0x2ddff Mewtwo2EnergyAbsorption_CheckDiscardPile: ; 2ddff (b:5dff) call CreateEnergyCardListFromDiscardPile_AllEnergy ldtx hl, ThereAreNoEnergyCardsInDiscardPileText ret -; 0x2de06 Mewtwo2EnergyAbsorption_PlayerSelectEffect: ; 2de06 (b:5e06) ldtx hl, Choose2EnergyCardsFromDiscardPileToAttachText call HandleEnergyCardsInDiscardPileSelection ret -; 0x2de0d Mewtwo2EnergyAbsorption_AISelectEffect: ; 2de0d (b:5e0d) ; AI picks first 2 energy cards @@ -5780,7 +5479,6 @@ Mewtwo2EnergyAbsorption_AISelectEffect: ; 2de0d (b:5e0d) ld a, $ff ; terminating byte ld [de], a ret -; 0x2de26 Mewtwo2EnergyAbsorption_AddToHandEffect: ; 2de26 (b:5e26) ld hl, hTempList @@ -5794,7 +5492,6 @@ Mewtwo2EnergyAbsorption_AddToHandEffect: ; 2de26 (b:5e26) ld [hl], CARD_LOCATION_ARENA pop hl jr .loop -; 0x2de39 ; returns carry if Strange Behavior cannot be used. StrangeBehavior_CheckDamage: ; 2de39 (b:5e39) @@ -5819,7 +5516,6 @@ StrangeBehavior_CheckDamage: ; 2de39 (b:5e39) .set_carry scf ret -; 0x2de5b StrangeBehavior_SelectAndSwapEffect: ; 2de5b (b:5e5b) ld a, DUELVARS_DUELIST_TYPE @@ -5874,7 +5570,6 @@ StrangeBehavior_SelectAndSwapEffect: ; 2de5b (b:5e5b) .play_sfx call Func_3794 jr .loop_input -; 0x2deb3 StrangeBehavior_SwapEffect: ; 2deb3 (b:5eb3) call TryGiveDamageCounter_StrangeBehavior @@ -5882,7 +5577,6 @@ StrangeBehavior_SwapEffect: ; 2deb3 (b:5eb3) bank1call PrintPlayAreaCardList_EnableLCD or a ret -; 0x2debc ; tries to give the damage counter to the target ; chosen by the Player (hTemp_ffa0). @@ -5907,7 +5601,6 @@ TryGiveDamageCounter_StrangeBehavior: ; 2debc (b:5ebc) .set_carry scf ret -; 0x2ded5 ; returns carry if has no damage counters. SpacingOut_CheckDamage: ; 2ded5 (b:5ed5) @@ -5916,7 +5609,6 @@ SpacingOut_CheckDamage: ; 2ded5 (b:5ed5) ldtx hl, NoDamageCountersText cp 10 ret -; 0x2dee0 SpacingOut_Success50PercentEffect: ; 2dee0 (b:5ee0) ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText @@ -5926,7 +5618,6 @@ SpacingOut_Success50PercentEffect: ; 2dee0 (b:5ee0) ld a, ATK_ANIM_RECOVER ld [wLoadedAttackAnimation], a ret -; 0x2def1 SpacingOut_HealEffect: ; 2def1 (b:5ef1) ldh a, [hTemp_ffa0] @@ -5941,7 +5632,6 @@ SpacingOut_HealEffect: ; 2def1 (b:5ef1) add 10 ld [hl], a ret -; 0x2df05 ; sets carry if no Trainer cards in the Discard Pile. Scavenge_CheckDiscardPile: ; 2df05 (b:5f05) @@ -5954,7 +5644,6 @@ Scavenge_CheckDiscardPile: ; 2df05 (b:5f05) call CreateTrainerCardListFromDiscardPile ldtx hl, ThereAreNoTrainerCardsInDiscardPileText ; this is redundant ret -; 0x2df1a Scavenge_PlayerSelectEnergyEffect: ; 2df1a (b:5f1a) ld a, TYPE_ENERGY_PSYCHIC @@ -5967,7 +5656,6 @@ Scavenge_PlayerSelectEnergyEffect: ; 2df1a (b:5f1a) ldh [hTemp_ffa0], a or a ret -; 0x2df2d Scavenge_AISelectEffect: ; 2df2d (b:5f2d) ; AI picks first Energy card in list @@ -5980,13 +5668,11 @@ Scavenge_AISelectEffect: ; 2df2d (b:5f2d) ld a, [wDuelTempList] ldh [hTempPlayAreaLocation_ffa1], a ret -; 0x2df40 Scavenge_DiscardEffect: ; 2df40 (b:5f40) ldh a, [hTemp_ffa0] call PutCardInDiscardPile ret -; 0x2df46 Scavenge_PlayerSelectTrainerEffect: ; 2df46 (b:5f46) call CreateTrainerCardListFromDiscardPile @@ -6000,7 +5686,6 @@ Scavenge_PlayerSelectTrainerEffect: ; 2df46 (b:5f46) ldh a, [hTempCardIndex_ff98] ldh [hTempPlayAreaLocation_ffa1], a ret -; 0x2df5f Scavenge_AddToHandEffect: ; 2df5f (b:5f5f) ldh a, [hTempPlayAreaLocation_ffa1] @@ -6012,30 +5697,25 @@ Scavenge_AddToHandEffect: ; 2df5f (b:5f5f) ldtx hl, WasPlacedInTheHandText bank1call DisplayCardDetailScreen ret -; 0x2df74 ; returns carry if Defending Pokemon has no attacks SlowpokeAmnesia_CheckAttacks: ; 2df74 (b:5f74) call CheckIfDefendingPokemonHasAnyAttack ldtx hl, NoAttackMayBeChoosenText ret -; 0x2df7b SlowpokeAmnesia_PlayerSelectEffect: ; 2df7b (b:5f7b) call PlayerPickAttackForAmnesia ret -; 0x2df7f SlowpokeAmnesia_AISelectEffect: ; 2df7f (b:5f7f) call AIPickAttackForAmnesia ldh [hTemp_ffa0], a ret -; 0x2df85 SlowpokeAmnesia_DisableEffect: ; 2df85 (b:5f85) call ApplyAmnesiaToAttack ret -; 0x2df89 ; returns carry if Arena card has no Psychic Energy attached ; or if it doesn't have any damage counters. @@ -6050,7 +5730,6 @@ KadabraRecover_CheckEnergyHP: ; 2df89 (b:5f89) ldtx hl, NoDamageCountersText cp 10 ret ; return carry if no damage -; 0x2dfa0 KadabraRecover_PlayerSelectEffect: ; 2dfa0 (b:5fa0) ld a, TYPE_ENERGY_PSYCHIC @@ -6062,7 +5741,6 @@ KadabraRecover_PlayerSelectEffect: ; 2dfa0 (b:5fa0) ldh a, [hTempCardIndex_ff98] ldh [hTemp_ffa0], a ; store card chosen ret -; 0x2dfb2 KadabraRecover_AISelectEffect: ; 2dfb2 (b:5fb2) ld a, TYPE_ENERGY_PSYCHIC @@ -6070,13 +5748,11 @@ KadabraRecover_AISelectEffect: ; 2dfb2 (b:5fb2) ld a, [wDuelTempList] ; pick first card ldh [hTemp_ffa0], a ret -; 0x2dfbd KadabraRecover_DiscardEffect: ; 2dfbd (b:5fbd) ldh a, [hTemp_ffa0] call PutCardInDiscardPile ret -; 0x2dfc3 KadabraRecover_HealEffect: ; 2dfc3 (b:5fc3) ld e, PLAY_AREA_ARENA @@ -6085,13 +5761,11 @@ KadabraRecover_HealEffect: ; 2dfc3 (b:5fc3) ld d, 0 call ApplyAndAnimateHPRecovery ret -; 0x2dfd7 JynxDoubleslap_AIEffect: ; 2dfd7 (b:5fd7) ld a, 20 / 2 lb de, 0, 20 jp SetExpectedAIDamage -; 0x2dfcf JynxDoubleslap_MultiplierEffect: ; 2dfcf (b:5fcf) ld hl, 10 @@ -6102,12 +5776,10 @@ JynxDoubleslap_MultiplierEffect: ; 2dfcf (b:5fcf) call ATimes10 call SetDefiniteDamage ret -; 0x2dff2 JynxMeditate_AIEffect: ; 2dff2 (b:5ff2) call JynxMeditate_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2dfec JynxMeditate_DamageBoostEffect: ; 2dfec (b:5fec) ; add damage counters of Defending card to damage @@ -6117,13 +5789,11 @@ JynxMeditate_DamageBoostEffect: ; 2dfec (b:5fec) call SwapTurn call AddToDamage ret -; 0x2e001 MysteryAttack_AIEffect: ; 2e001 (b:6001) ld a, 10 lb de, 0, 20 jp SetExpectedAIDamage -; 0x2e009 MysteryAttack_RandomEffect: ; 2e009 (b:6009) ld a, 10 @@ -6159,7 +5829,6 @@ MysteryAttack_RandomEffect: ; 2e009 (b:6009) call SetNoEffectFromStatus .no_effect ret -; 0x2e03e MysteryAttack_RecoverEffect: ; 2e03e (b:603e) ; in case the 5th option was chosen for random effect, @@ -6170,13 +5839,11 @@ MysteryAttack_RecoverEffect: ; 2e03e (b:603e) lb de, 0, 10 call ApplyAndAnimateHPRecovery ret -; 0x2e04a StoneBarrage_AIEffect: ; 2e04a (b:604a) ld a, 10 lb de, 0, 100 jp SetExpectedAIDamage -; 0x2e052 StoneBarrage_MultiplierEffect: ; 2e052 (b:6052) xor a @@ -6203,19 +5870,16 @@ StoneBarrage_MultiplierEffect: ; 2e052 (b:6052) ld a, h ld [de], a ret -; 0x2e075 OnixHardenEffect: ; 2e075 (b:6075) ld a, SUBSTATUS1_HARDEN call ApplySubstatus1ToDefendingCard ret -; 0x2e07b PrimeapeFurySwipes_AIEffect: ; 2e07b (b:607b) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2e083 PrimeapeFurySwipes_MultiplierEffect: ; 2e083 (b:6083) ld hl, 20 @@ -6227,7 +5891,6 @@ PrimeapeFurySwipes_MultiplierEffect: ; 2e083 (b:6083) call ATimes10 call SetDefiniteDamage ret -; 0x2e099 TantrumEffect: ; 2e099 (b:6099) ldtx de, IfTailsYourPokemonBecomesConfusedText @@ -6240,17 +5903,14 @@ TantrumEffect: ; 2e099 (b:6099) call ConfusionEffect call SwapTurn ret -; 0x2e0af StrikesBackEffect: ; 2e0af (b:60af) scf ret -; 0x2e0b1 KabutoArmorEffect: ; 2e0b1 (b:60b1) scf ret -; 0x2e0b3 AbsorbEffect: ; 2e0b3 (b:60b3) ld hl, wDealtDamage @@ -6269,31 +5929,26 @@ AbsorbEffect: ; 2e0b3 (b:60b3) ld d, h call ApplyAndAnimateHPRecovery ret -; 0x2e0cb SnivelEffect: ; 2e0cb (b:60cb) ld a, SUBSTATUS2_REDUCE_BY_20 call ApplySubstatus2ToDefendingCard ret -; 0x2e0d1 CuboneRage_AIEffect: ; 2e0d1 (b:60d1) call CuboneRage_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2e0d7 CuboneRage_DamageBoostEffect: ; 2e0d7 (b:60d7) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call AddToDamage ret -; 0x2e0e0 Bonemerang_AIEffect: ; 2e0e0 (b:60e0) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2e0e8 Bonemerang_MultiplierEffect: ; 2e0e8 (b:60e8) ld hl, 30 @@ -6307,7 +5962,6 @@ Bonemerang_MultiplierEffect: ; 2e0e8 (b:60e8) call ATimes10 call SetDefiniteDamage ret -; 0x2e100 ; returns carry if can't add Pokemon from deck MarowakCallForFamily_CheckDeckAndPlayArea: ; 2e100 (b:6100) @@ -6319,7 +5973,6 @@ MarowakCallForFamily_CheckDeckAndPlayArea: ; 2e100 (b:6100) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2e110 MarowakCallForFamily_PlayerSelectEffect: ; 2e110 (b:6110) ld a, $ff @@ -6387,7 +6040,6 @@ MarowakCallForFamily_PlayerSelectEffect: ; 2e110 (b:6110) ldh [hTemp_ffa0], a or a ret -; 0x2e177 MarowakCallForFamily_AISelectEffect: ; 2e177 (b:6177) call CreateDeckCardList @@ -6406,7 +6058,6 @@ MarowakCallForFamily_AISelectEffect: ; 2e177 (b:6177) jr nz, .loop_deck ; found ret -; 0x2e194 MarowakCallForFamily_PutInPlayAreaEffect: ; 2e194 (b:6194) ldh a, [hTemp_ffa0] @@ -6424,12 +6075,10 @@ MarowakCallForFamily_PutInPlayAreaEffect: ; 2e194 (b:6194) .shuffle call Func_2c0bd ret -; 0x2c1b4 KarateChop_AIEffect: ; 2e1b4 (b:61b4) call KarateChop_DamageSubtractionEffect jp SetDefiniteAIDamage -; 0x2e1ba KarateChop_DamageSubtractionEffect: ; 2e1ba (b:61ba) ld e, PLAY_AREA_ARENA @@ -6448,13 +6097,11 @@ KarateChop_DamageSubtractionEffect: ; 2e1ba (b:61ba) xor a call SetDefiniteDamage ret -; 0x2e1d1 SubmissionEffect: ; 2e1d1 (b:61d1) ld a, 20 call DealRecoilDamageToSelf ret -; 0x2e1d7 GolemSelfdestructEffect: ; 2e1d7 (b:61d7) ld a, 100 @@ -6470,13 +6117,11 @@ GolemSelfdestructEffect: ; 2e1d7 (b:61d7) call DealDamageToAllBenchedPokemon call SwapTurn ret -; 0x2e1f6 GravelerHardenEffect: ; 2e1f6 (b:61f6) ld a, SUBSTATUS1_HARDEN call ApplySubstatus1ToDefendingCard ret -; 0x2e1fc Ram_SelectSwitchEffect: ; 2e1fc (b:61fc) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -6491,7 +6136,6 @@ Ram_SelectSwitchEffect: ; 2e1fc (b:61fc) ld a, $ff ldh [hTemp_ffa0], a ret -; 0x2e212 Ram_RecoilSwitchEffect: ; 2e212 (b:6212) ld a, 20 @@ -6499,7 +6143,6 @@ Ram_RecoilSwitchEffect: ; 2e212 (b:6212) ldh a, [hTemp_ffa0] call HandleSwitchDefendingPokemonEffect ret -; 0x2e21d LeerEffect: ; 2e21d (b:621d) ldtx de, IfHeadsOpponentCannotAttackText @@ -6510,7 +6153,6 @@ LeerEffect: ; 2e21d (b:621d) ld a, SUBSTATUS2_LEER call ApplySubstatus2ToDefendingCard ret -; 0x2e231 ; return carry if opponent has no Bench Pokemon. StretchKick_CheckBench: ; 2e231 (b:6231) @@ -6519,7 +6161,6 @@ StretchKick_CheckBench: ; 2e231 (b:6231) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2e23c StretchKick_PlayerSelectEffect: ; 2e23c (b:623c) ldtx hl, ChoosePkmnInTheBenchToGiveDamageText @@ -6533,14 +6174,12 @@ StretchKick_PlayerSelectEffect: ; 2e23c (b:623c) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2e255 StretchKick_AISelectEffect: ; 2e255 (b:6255) ; chooses Bench Pokemon with least amount of remaining HP call GetBenchPokemonWithLowestHP ldh [hTemp_ffa0], a ret -; 0x2e25b StretchKick_BenchDamageEffect: ; 2e25b (b:625b) call SwapTurn @@ -6550,19 +6189,16 @@ StretchKick_BenchDamageEffect: ; 2e25b (b:625b) call DealDamageToPlayAreaPokemon_RegularAnim call SwapTurn ret -; 0x2e26b SandAttackEffect: ; 2e26b (b:626b) ld a, SUBSTATUS2_SAND_ATTACK call ApplySubstatus2ToDefendingCard ret -; 0x2e271 SandslashFurySwipes_AIEffect: ; 2e271 (b:6271) ld a, 60 / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2e279 SandslashFurySwipes_MultiplierEffect: ; 2e279 (b:6279) ld hl, 20 @@ -6574,7 +6210,6 @@ SandslashFurySwipes_MultiplierEffect: ; 2e279 (b:6279) call ATimes10 call SetDefiniteDamage ret -; 0x2e28f EarthquakeEffect: ; 2e28f (b:628f) ld a, $01 @@ -6582,12 +6217,10 @@ EarthquakeEffect: ; 2e28f (b:628f) ld a, 10 call DealDamageToAllBenchedPokemon ret -; 0x2e29a PrehistoricPowerEffect: ; 2e29a (b:629a) scf ret -; 0x2e29c ; returns carry if Pkmn Power can't be used. Peek_OncePerTurnCheck: ; 2e29c (b:629c) @@ -6604,7 +6237,6 @@ Peek_OncePerTurnCheck: ; 2e29c (b:629c) ldtx hl, OnlyOncePerTurnText scf ret -; 0x2e2b4 Peek_SelectEffect: ; 2e2b4 (b:62b4) ; set Pkmn Power used flag @@ -6665,7 +6297,6 @@ Peek_SelectEffect: ; 2e2b4 (b:62b4) ldtx hl, CardPeekWasUsedOnText call DrawWideTextBox_WaitForInput ret -; 0x2e30f BoneAttackEffect: ; 2e30f (b:630f) ldtx de, IfHeadsOpponentCannotAttackText @@ -6674,7 +6305,6 @@ BoneAttackEffect: ; 2e30f (b:630f) ld a, SUBSTATUS2_BONE_ATTACK call ApplySubstatus2ToDefendingCard ret -; 0x2e31c ; return carry if neither Play Area ; has room for more Bench Pokemon. @@ -6693,7 +6323,6 @@ Wail_BenchCheck: ; 2e31c (b:631c) .no_carry or a ret -; 0x2e335 Wail_FillBenchEffect: ; 2e335 (b:6335) call SwapTurn @@ -6753,13 +6382,11 @@ Wail_FillBenchEffect: ; 2e335 (b:6335) .done call Func_2c0bd ret -; 0x2e399 Thunderpunch_AIEffect: ; 2e399 (b:6399) ld a, (30 + 40) / 2 lb de, 30, 40 jp SetExpectedAIDamage -; 0x2e3a1 Thunderpunch_ModifierEffect: ; 2e3a1 (b:63a1) ldtx de, IfHeadPlus10IfTails10ToYourselfText @@ -6769,7 +6396,6 @@ Thunderpunch_ModifierEffect: ; 2e3a1 (b:63a1) ld a, 10 call AddToDamage ret -; 0x2e3b0 Thunderpunch_RecoilEffect: ; 2e3b0 (b:63b0) ldh a, [hTemp_ffa0] @@ -6778,19 +6404,16 @@ Thunderpunch_RecoilEffect: ; 2e3b0 (b:63b0) ld a, 10 call DealRecoilDamageToSelf ret -; 0x2e3ba LightScreenEffect: ; 2e3ba (b:63ba) ld a, SUBSTATUS1_HALVE_DAMAGE call ApplySubstatus1ToDefendingCard ret -; 0x2e3c0 ElectabuzzQuickAttack_AIEffect: ; 2e3c0 (b:63c0) ld a, (10 + 30) / 2 lb de, 10, 30 jp SetExpectedAIDamage -; 0x2e3c8 ElectabuzzQuickAttack_DamageBoostEffect: ; 2e3c8 (b:63c8) ld hl, 20 @@ -6801,7 +6424,6 @@ ElectabuzzQuickAttack_DamageBoostEffect: ; 2e3c8 (b:63c8) ld a, 20 call AddToDamage ret -; 0x2e3db MagnemiteSelfdestructEffect: ; 2e3db (b:63db) ld a, 40 @@ -6819,7 +6441,6 @@ MagnemiteSelfdestructEffect: ; 2e3db (b:63db) call DealDamageToAllBenchedPokemon call SwapTurn ret -; 0x2e3fa ZapdosThunder_Recoil50PercentEffect: ; 2e3fa (b:63fa) ld hl, 30 @@ -6828,7 +6449,6 @@ ZapdosThunder_Recoil50PercentEffect: ; 2e3fa (b:63fa) call TossCoin_BankB ldh [hTemp_ffa0], a ret -; 0x2e409 ZapdosThunder_RecoilEffect: ; 2e409 (b:6409) ld hl, 30 @@ -6839,7 +6459,6 @@ ZapdosThunder_RecoilEffect: ; 2e409 (b:6409) ld a, 30 call DealRecoilDamageToSelf ret -; 0x2e419 ThunderboltEffect: ; 2e419 (b:6419) xor a @@ -6852,7 +6471,6 @@ ThunderboltEffect: ; 2e419 (b:6419) ret z call PutCardInDiscardPile jr .loop -; 0x2e429 ThunderstormEffect: ; 2e429 (b:6429) ld a, 1 @@ -6924,7 +6542,6 @@ ThunderstormEffect: ; 2e429 (b:6429) .done call SwapTurn ret -; 0x2e491 ; displays text for current Bench Pokemon, ; printing its Bench number and name. @@ -6954,13 +6571,11 @@ ThunderstormEffect: ; 2e429 (b:6429) xor a ld [wDuelDisplayedScreen], a ret -; 0x2e4bb JolteonQuickAttack_AIEffect: ; 2e4bb (b:64bb) ld a, (10 + 30) / 2 lb de, 10, 30 jp SetExpectedAIDamage -; 0x2e4c3 JolteonQuickAttack_DamageBoostEffect: ; 2e4c3 (b:64c3) ld hl, 20 @@ -6971,13 +6586,11 @@ JolteonQuickAttack_DamageBoostEffect: ; 2e4c3 (b:64c3) ld a, 20 call AddToDamage ret -; 0x2e3d6 PinMissile_AIEffect: ; 2e4d6 (b:64d6) ld a, (20 * 4) / 2 lb de, 0, 80 jp SetExpectedAIDamage -; 0x2e4de PinMissile_MultiplierEffect: ; 2e4de (b:64de) ld hl, 20 @@ -6989,13 +6602,11 @@ PinMissile_MultiplierEffect: ; 2e4de (b:64de) call ATimes10 call SetDefiniteDamage ret -; 0x2e4f4 Fly_AIEffect: ; 2e4f4 (b:64f4) ld a, 30 / 2 lb de, 0, 30 jp SetExpectedAIDamage -; 0x2e4fc Fly_Success50PercentEffect: ; 2e4fc (b:64fc) ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText @@ -7012,7 +6623,6 @@ Fly_Success50PercentEffect: ; 2e4fc (b:64fc) ld a, SUBSTATUS1_FLY call ApplySubstatus1ToDefendingCard ret -; 0x2e51a ThunderJolt_Recoil50PercentEffect: ; 2e51a (b:651a) ld hl, 10 @@ -7021,7 +6631,6 @@ ThunderJolt_Recoil50PercentEffect: ; 2e51a (b:651a) call TossCoin_BankB ldh [hTemp_ffa0], a ret -; 0x2e529 ThunderJolt_RecoilEffect: ; 2e529 (b:6529) ld hl, 10 @@ -7032,7 +6641,6 @@ ThunderJolt_RecoilEffect: ; 2e529 (b:6529) ld a, 10 call DealRecoilDamageToSelf ret -; 0x2e539 Spark_PlayerSelectEffect: ; 2e539 (b:6539) ld a, $ff @@ -7059,7 +6667,6 @@ Spark_PlayerSelectEffect: ; 2e539 (b:6539) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2e562 Spark_AISelectEffect: ; 2e562 (b:6562) ld a, $ff @@ -7072,7 +6679,6 @@ Spark_AISelectEffect: ; 2e562 (b:6562) call GetBenchPokemonWithLowestHP ldh [hTemp_ffa0], a ret -; 0x2e574 Spark_BenchDamageEffect: ; 2e574 (b:6574) ldh a, [hTemp_ffa0] @@ -7085,19 +6691,16 @@ Spark_BenchDamageEffect: ; 2e574 (b:6574) call DealDamageToPlayAreaPokemon_RegularAnim call SwapTurn ret -; 0x2e589 Pikachu3GrowlEffect: ; 2e589 (b:6589) ld a, SUBSTATUS2_GROWL call ApplySubstatus2ToDefendingCard ret -; 0x2e58f Pikachu4GrowlEffect: ; 2e58f (b:658f) ld a, SUBSTATUS2_GROWL call ApplySubstatus2ToDefendingCard ret -; 0x2e595 ChainLightningEffect: ; 2e595 (b:6595) ld a, 10 @@ -7119,7 +6722,6 @@ ChainLightningEffect: ; 2e595 (b:6595) ld [wIsDamageToSelf], a call .DamageSameColorBench ret -; 0x2e5ba .DamageSameColorBench ; 2e5ba (b:65ba) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -7147,7 +6749,6 @@ ChainLightningEffect: ; 2e595 (b:6595) dec e jr nz, .check_damage ret -; 0x2e5dc RaichuAgilityEffect: ; 2e5dc (b:65dc) ldtx de, IfHeadsDoNotReceiveDamageOrEffectText @@ -7158,7 +6759,6 @@ RaichuAgilityEffect: ; 2e5dc (b:65dc) ld a, SUBSTATUS1_AGILITY call ApplySubstatus1ToDefendingCard ret -; 0x2e5ee RaichuThunder_Recoil50PercentEffect: ; 2e5ee (b:65ee) ld hl, 30 @@ -7167,7 +6767,6 @@ RaichuThunder_Recoil50PercentEffect: ; 2e5ee (b:65ee) call TossCoin_BankB ldh [hTemp_ffa0], a ret -; 0x2e5fd RaichuThunder_RecoilEffect: ; 2e5fd (b:65fd) ld hl, 30 @@ -7178,7 +6777,6 @@ RaichuThunder_RecoilEffect: ; 2e5fd (b:65fd) ld a, 30 call DealRecoilDamageToSelf ret -; 0x2e60d Gigashock_PlayerSelectEffect: ; 2e60d (b:660d) call SwapTurn @@ -7286,7 +6884,6 @@ Gigashock_PlayerSelectEffect: ; 2e60d (b:660d) dec a ld [wce72], a jr .start -; 0x2e6af ; returns carry if Bench Pokemon ; in register a was already chosen. @@ -7308,7 +6905,6 @@ Gigashock_PlayerSelectEffect: ; 2e60d (b:660d) jr nz, .check_chosen or a ret -; 0x2e6c3 Gigashock_AISelectEffect: ; 2e6c3 (b:66c3) ; if Bench has 3 Pokemon or less, no need for selection, @@ -7396,7 +6992,6 @@ Gigashock_AISelectEffect: ; 2e6c3 (b:66c3) ldh [hTempList + 3], a call SwapTurn ret -; 0x2e71f Gigashock_BenchDamageEffect: ; 2e71f (b:671f) call SwapTurn @@ -7414,7 +7009,6 @@ Gigashock_BenchDamageEffect: ; 2e71f (b:671f) .done call SwapTurn ret -; 0x2e739 Magneton1SelfdestructEffect: ; 2e739 (b:6739) ld a, 80 @@ -7434,17 +7028,14 @@ Magneton1SelfdestructEffect: ; 2e739 (b:6739) call DealDamageToAllBenchedPokemon call SwapTurn ret -; 0x2e758 MagnetonSonicboom_UnaffectedByColorEffect: ; 2e758 (b:6758) ld hl, wDamage + 1 set UNAFFECTED_BY_WEAKNESS_RESISTANCE_F, [hl] ret -; 0x2e75e MagnetonSonicboom_NullEffect: ; 2e75e (b:675e) ret -; 0x2e75f Magneton2SelfdestructEffect: ; 2e75f (b:675f) ld a, 100 @@ -7464,12 +7055,10 @@ Magneton2SelfdestructEffect: ; 2e75f (b:675f) call DealDamageToAllBenchedPokemon call SwapTurn ret -; 0x2e77e PealOfThunder_InitialEffect: ; 2e77e (b:677e) scf ret -; 0x2e780 PealOfThunder_RandomlyDamageEffect: ; 2e780 (b:6780) call ExchangeRNG @@ -7477,7 +7066,6 @@ PealOfThunder_RandomlyDamageEffect: ; 2e780 (b:6780) call RandomlyDamagePlayAreaPokemon bank1call Func_6e49 ret -; 0x2e78d ; randomly damages a Pokemon in play, except ; card that is in [hTempPlayAreaLocation_ff9d]. @@ -7522,14 +7110,12 @@ RandomlyDamagePlayAreaPokemon: ; 2e78d (b:678d) call .damage call SwapTurn ret -; 0x2e7cb BigThunderEffect: ; 2e7cb (b:67cb) call ExchangeRNG ld de, 70 ; damage to inflict call RandomlyDamagePlayAreaPokemon ret -; 0x2e7d5 MagneticStormEffect: ; 2e7d5 (b:67d5) ld a, DUELVARS_CARD_LOCATIONS @@ -7659,23 +7245,19 @@ MagneticStormEffect: ; 2e7d5 (b:67d5) xor a call Func_2c10b ret -; 0x2e870 ElectrodeSonicboom_UnaffectedByColorEffect: ; 2e870 (b:6870) ld hl, wDamage + 1 set UNAFFECTED_BY_WEAKNESS_RESISTANCE_F, [hl] ret -; 0x2e876 ElectrodeSonicboom_NullEffect: ; 2e876 (b:6876) ret -; 0x2e877 ; return carry if no cards in Deck EnergySpike_DeckCheck: ; 2e877 (b:6877) call CheckIfDeckIsEmpty ret -; 0x2e87b EnergySpike_PlayerSelectEffect: ; 2e87b (b:687b) ld a, $ff @@ -7750,14 +7332,12 @@ EnergySpike_PlayerSelectEffect: ; 2e87b (b:687b) ld a, $ff ldh [hTemp_ffa0], a ret -; 0x2e8f1 EnergySpike_AISelectEffect: ; 2e8f1 (b:68f1) ; AI doesn't select any card ld a, $ff ldh [hTemp_ffa0], a ret -; 0x2e8f6 EnergySpike_AttachEnergyEffect: ; 2e8f6 (b:68f6) ldh a, [hTemp_ffa0] @@ -7794,13 +7374,11 @@ EnergySpike_AttachEnergyEffect: ; 2e8f6 (b:68f6) .done call Func_2c0bd ret -; 0x2e930 JolteonDoubleKick_AIEffect: ; 2e930 (b:6930) ld a, 40 / 2 lb de, 0, 40 jp SetExpectedAIDamage -; 0x2e938 JolteonDoubleKick_MultiplierEffect: ; 2e938 (b:6938) ld hl, 20 @@ -7812,7 +7390,6 @@ JolteonDoubleKick_MultiplierEffect: ; 2e938 (b:6938) call ATimes10 call SetDefiniteDamage ret -; 0x2e94e TailWagEffect: ; 2e94e (b:694e) ldtx de, IfHeadsOpponentCannotAttackText @@ -7823,13 +7400,11 @@ TailWagEffect: ; 2e94e (b:694e) ld a, SUBSTATUS2_TAIL_WAG call ApplySubstatus2ToDefendingCard ret -; 0x2e962 EeveeQuickAttack_AIEffect: ; 2e962 (b:5962) ld a, (10 + 30) / 2 lb de, 10, 30 jp SetExpectedAIDamage -; 0x2e96a EeveeQuickAttack_DamageBoostEffect: ; 2e96a (b:596a) ld hl, 20 @@ -7840,35 +7415,27 @@ EeveeQuickAttack_DamageBoostEffect: ; 2e96a (b:596a) ld a, 20 call AddToDamage ret -; 0x2e97d SpearowMirrorMove_AIEffect: ; 2e97d (b:697d) jr MirrorMoveEffects.AIEffect -; 0x2e97f SpearowMirrorMove_InitialEffect1: ; 2e97f (b:697f) jr MirrorMoveEffects.InitialEffect1 -; 0x2e981 SpearowMirrorMove_InitialEffect2: ; 2e981 (b:6981) jr MirrorMoveEffects.InitialEffect2 -; 0x2e983 SpearowMirrorMove_PlayerSelection: ; 2e983 (b:6983) jr MirrorMoveEffects.PlayerSelection -; 0x2e985 SpearowMirrorMove_AISelection: ; 2e985 (b:6985) jr MirrorMoveEffects.AISelection -; 0x2e987 SpearowMirrorMove_BeforeDamage: ; 2e987 (b:6987) jr MirrorMoveEffects.BeforeDamage -; 0x2e989 SpearowMirrorMove_AfterDamage: ; 2e989 (b:6989) jp MirrorMoveEffects.AfterDamage -; 0x2e98c ; these are effect commands that Mirror Move uses ; in order to mimic last turn's attack. @@ -7996,7 +7563,6 @@ MirrorMoveEffects: ; 2e98c (b:698c) .apply_amnesia call ApplyAmnesiaToAttack ret -; 0x2ea28 .AfterDamage: ; 2ea28 (b:6a28) ld a, [wNoDamageOrEffect] @@ -8061,7 +7627,6 @@ MirrorMoveEffects: ; 2e98c (b:698c) call DrawWideTextBox_PrintText call SwapTurn ret -; 0x2ea8f .ExecuteStatusEffect: ; 2ea8f (b:6a8f) ld c, a @@ -8088,7 +7653,6 @@ MirrorMoveEffects: ; 2e98c (b:698c) cp PARALYZED jp z, ParalysisEffect ret -; 0x2eab8 FearowAgilityEffect: ; 2eab8 (b:6ab8) ldtx de, IfHeadsDoNotReceiveDamageOrEffectText @@ -8099,7 +7663,6 @@ FearowAgilityEffect: ; 2eab8 (b:6ab8) ld a, SUBSTATUS1_AGILITY call ApplySubstatus1ToDefendingCard ret -; 0x2eaca ; return carry if cannot use Step In StepIn_BenchCheck: ; 2eaca (b:6aca) @@ -8122,7 +7685,6 @@ StepIn_BenchCheck: ; 2eaca (b:6aca) .set_carry scf ret -; 0x2eae8 StepIn_SwitchEffect: ; 2eae8 (b:6ae8) ldh a, [hTemp_ffa0] @@ -8132,13 +7694,11 @@ StepIn_SwitchEffect: ; 2eae8 (b:6ae8) call GetTurnDuelistVariable set USED_PKMN_POWER_THIS_TURN_F, [hl] ret -; 0x2eaf6 Dragonite2Slam_AIEffect: ; 2eaf6 (b:6af6) ld a, (40 * 2) / 2 lb de, 0, 80 jp SetExpectedAIDamage -; 0x2eafe Dragonite2Slam_MultiplierEffect: ; 2eafe (b:6afe) ld hl, 40 @@ -8151,18 +7711,15 @@ Dragonite2Slam_MultiplierEffect: ; 2eafe (b:6afe) call ATimes10 call SetDefiniteDamage ret -; 0x2eb15 ThickSkinnedEffect: ; 2eb15 (b:6b15) scf ret -; 0x2eb17 LeekSlap_AIEffect: ; 2eb17 (b:6b17) ld a, 30 / 2 lb de, 0, 30 jp SetExpectedAIDamage -; 0x2eb1f ; return carry if already used attack in this duel LeekSlap_OncePerDuelCheck: ; 2eb1f (b:6b1f) @@ -8174,14 +7731,12 @@ LeekSlap_OncePerDuelCheck: ; 2eb1f (b:6b1f) ldtx hl, ThisAttackCannotBeUsedTwiceText scf ret -; 0x2eb2c LeekSlap_SetUsedThisDuelFlag: ; 2eb2c (b:6b2c) ld a, DUELVARS_ARENA_CARD_FLAGS call GetTurnDuelistVariable set USED_LEEK_SLAP_THIS_DUEL_F, [hl] ret -; 0x2eb34 LeekSlap_NoDamage50PercentEffect: ; 2eb34 (b:6b34) ldtx de, DamageCheckIfTailsNoDamageText @@ -8190,7 +7745,6 @@ LeekSlap_NoDamage50PercentEffect: ; 2eb34 (b:6b34) xor a ; 0 damage call SetDefiniteDamage ret -; 0x2eb40 FetchEffect: ; 2eb40 (b:6b40) ldtx hl, Draw1CardFromTheDeckText @@ -8206,13 +7760,11 @@ FetchEffect: ; 2eb40 (b:6b40) ; show card on screen if it was Player bank1call OpenCardPage_FromHand ret -; 0x2eb5d CometPunch_AIEffect: ; 2eb5d (b:6b5d) ld a, (20 * 4) / 2 lb de, 0, 80 jp SetExpectedAIDamage -; 0x2eb65 CometPunch_MultiplierEffect: ; 2eb65 (b:6b65) ld hl, 20 @@ -8224,13 +7776,11 @@ CometPunch_MultiplierEffect: ; 2eb65 (b:6b65) call ATimes10 call SetDefiniteDamage ret -; 0x2eb7b TaurosStomp_AIEffect: ; 2eb7b (b:6b7b) ld a, (20 + 30) / 2 lb de, 20, 30 jp SetExpectedAIDamage -; 0x2eb83 TaurosStomp_DamageBoostEffect: ; 2eb83 (b:6b83) ld hl, 10 @@ -8241,14 +7791,12 @@ TaurosStomp_DamageBoostEffect: ; 2eb83 (b:6b83) ld a, 10 call AddToDamage ret -; 0x2eb96 Rampage_AIEffect: ; 2eb96 (b:6b96) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call AddToDamage jp SetDefiniteAIDamage -; 0x2eba1 Rampage_Confusion50PercentEffect: ; 2eba1 (b:6ba1) ld e, PLAY_AREA_ARENA @@ -8261,13 +7809,11 @@ Rampage_Confusion50PercentEffect: ; 2eba1 (b:6ba1) call ConfusionEffect call SwapTurn ret -; 0x2ebba FuryAttack_AIEffect: ; 2ebba (b:6bba) ld a, (10 * 2) / 2 lb de, 0, 20 jp SetExpectedAIDamage -; 0x2ebc2 FuryAttack_MultiplierEffect: ; 2ebc2 (b:6bc2) ld hl, 10 @@ -8278,24 +7824,20 @@ FuryAttack_MultiplierEffect: ; 2ebc2 (b:6bc2) call ATimes10 call SetDefiniteDamage ret -; 0x2ebd7 RetreatAidEffect: ; 2ebd7 (b:6bd7) scf ret -; 0x2ebd9 DodrioRage_AIEffect: ; 2ebd9 (b:6bd9) call DodrioRage_DamageBoostEffect jp SetDefiniteAIDamage -; 0x2ebdf DodrioRage_DamageBoostEffect: ; 2ebdf (b:6bdf) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call AddToDamage ret -; 0x2ebe8 PayDayEffect: ; 2ebe8 (b:6be8) ldtx de, IfHeadsDraw1CardFromDeckText @@ -8314,13 +7856,11 @@ PayDayEffect: ; 2ebe8 (b:6be8) ; show card on screen if it was Player bank1call OpenCardPage_FromHand ret -; 0x2ec0c DragonairSlam_AIEffect: ; 2ec0c (b:6c0c) ld a, (30 * 2) / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2ec14 DragonairSlam_MultiplierEffect: ; 2ec14 (b:6c14) ld hl, 30 @@ -8334,17 +7874,14 @@ DragonairSlam_MultiplierEffect: ; 2ec14 (b:6c14) call ATimes10 call SetDefiniteDamage ret -; 0x2ec2c DragonairHyperBeam_PlayerSelectEffect: ; 2ec2c (b:6c2c) jp HandleEnergyDiscardEffectSelection -; 0x2ec2f DragonairHyperBeam_AISelectEffect: ; 2ec2f (b:6c2f) call AIPickEnergyCardToDiscardFromDefendingPokemon ldh [hTemp_ffa0], a ret -; 0x2ec35 DragonairHyperBeam_DiscardEffect: ; 2ec35 (b:6c35) call HandleNoDamageOrEffect @@ -8359,7 +7896,6 @@ DragonairHyperBeam_DiscardEffect: ; 2ec35 (b:6c35) ld [hl], LAST_TURN_EFFECT_DISCARD_ENERGY call SwapTurn ret -; 0x2ec4f ; handles screen for selecting an Energy card to discard ; that is attached to Defending Pokemon, @@ -8388,31 +7924,26 @@ HandleEnergyDiscardEffectSelection: ; 2ec4f (b:6c4f) ld a, $ff ldh [hTemp_ffa0], a ret -; 0x2ec77 ; return carry if Defending Pokemon has no attacks ClefableMetronome_CheckAttacks: ; 2ec77 (b:6c77) call CheckIfDefendingPokemonHasAnyAttack ldtx hl, NoAttackMayBeChoosenText ret -; 0x2ec7e ClefableMetronome_AISelectEffect: ; 2ec7e (b:6c7e) call HandleAIMetronomeEffect ret -; 0x2ec82 ClefableMetronome_UseAttackEffect: ; 2ec82 (b:6c82) ld a, 1 ; energy cost of this attack call HandlePlayerMetronomeEffect ret -; 0x2ec88 ClefableMinimizeEffect: ; 2ec88 (b:6c88) ld a, SUBSTATUS1_REDUCE_BY_20 call ApplySubstatus1ToDefendingCard ret -; 0x2ec8e HurricaneEffect: ; 2ec8e (b:6c8e) call HandleNoDamageOrEffect @@ -8459,7 +7990,6 @@ HurricaneEffect: ; 2ec8e (b:6c8e) ld [wDuelDisplayedScreen], a call SwapTurn ret -; 0x2ecd3 PidgeottoWhirlwind_SelectEffect: ; 2ecd3 (b:6cd3) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -8475,59 +8005,47 @@ PidgeottoWhirlwind_SelectEffect: ; 2ecd3 (b:6cd3) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2ece9 PidgeottoWhirlwind_SwitchEffect: ; 2ece9 (b:6ce9) ldh a, [hTemp_ffa0] call HandleSwitchDefendingPokemonEffect ret -; 0x2ecef PidgeottoMirrorMove_AIEffect: ; 2ecef (b:6cef) jp MirrorMoveEffects.AIEffect -; 0x2ecf2 PidgeottoMirrorMove_InitialEffect1: ; 2ecf2 (b:6cf2) jp MirrorMoveEffects.InitialEffect1 -; 0x2ecf5 PidgeottoMirrorMove_InitialEffect2: ; 2ecf5 (b:6cf5) jp MirrorMoveEffects.InitialEffect2 -; 0x2ecf8 PidgeottoMirrorMove_PlayerSelection: ; 2ecf8 (b:6cf8) jp MirrorMoveEffects.PlayerSelection -; 0x2ecfb PidgeottoMirrorMove_AISelection: ; 2ecfb (b:6cfb) jp MirrorMoveEffects.AISelection -; 0x2ecfe PidgeottoMirrorMove_BeforeDamage: ; 2ecfe (b:6cfe) jp MirrorMoveEffects.BeforeDamage -; 0x2ed01 PidgeottoMirrorMove_AfterDamage: ; 2ed01 (b:6d01) jp MirrorMoveEffects.AfterDamage -; 0x2ed04 SingEffect: ; 2ed04 (b:6d04) call Sleep50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2ed0b ; return carry if Defending Pokemon has no attacks ClefairyMetronome_CheckAttacks: ; 2ed0b (b:6d0b) call CheckIfDefendingPokemonHasAnyAttack ldtx hl, NoAttackMayBeChoosenText ret -; 0x2ed12 ClefairyMetronome_AISelectEffect: ; 2ed12 (b:6d12) call HandleAIMetronomeEffect ret -; 0x2ed16 ClefairyMetronome_UseAttackEffect: ; 2ed16 (b:6d16) ld a, 3 ; energy cost of this attack @@ -8612,12 +8130,10 @@ HandlePlayerMetronomeEffect: ; 2ed18 (b:6d18) ld [wPlayerAttackingCardID], a or a ret -; 0x2ed86 ; does nothing for AI. HandleAIMetronomeEffect: ; 2ed86 (b:6d86) ret -; 0x2ed87 DoTheWaveEffect: ; 2ed87 (b:6d87) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -8626,7 +8142,6 @@ DoTheWaveEffect: ; 2ed87 (b:6d87) call ATimes10 call AddToDamage ret -; 0x2ed94 ; return carry if no damage counters FirstAid_DamageCheck: ; 2ed94 (b:6d94) @@ -8635,31 +8150,26 @@ FirstAid_DamageCheck: ; 2ed94 (b:6d94) ldtx hl, NoDamageCountersText cp 10 ret -; 0x2ed9f FirstAid_HealEffect: ; 2ed9f (b:6d9f) lb de, 0, 10 call ApplyAndAnimateHPRecovery ret -; 0x2eda6 JigglypuffDoubleEdgeEffect: ; 2eda6 (b:6da6) ld a, 20 call DealRecoilDamageToSelf ret -; 0x2edac PounceEffect: ; 2edac (b:6dac) ld a, SUBSTATUS2_POUNCE call ApplySubstatus2ToDefendingCard ret -; 0x2edb2 LickitungSupersonicEffect: ; 2edb2 (b:6db2) call Confusion50PercentEffect call nc, SetNoEffectFromStatus ret -; 0x2edb9 PidgeyWhirlwind_SelectEffect: ; 2edb9 (b:6db9) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -8675,13 +8185,11 @@ PidgeyWhirlwind_SelectEffect: ; 2edb9 (b:6db9) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2edcf PidgeyWhirlwind_SwitchEffect: ; 2edcf (b:6dcf) ldh a, [hTemp_ffa0] call HandleSwitchDefendingPokemonEffect ret -; 0x2edd5 ; return carry if Defending card has no weakness Conversion1_WeaknessCheck: ; 2edd5 (b:6dd5) @@ -8696,7 +8204,6 @@ Conversion1_WeaknessCheck: ; 2edd5 (b:6dd5) ldtx hl, NoWeaknessText scf ret -; 0x2eded Conversion1_PlayerSelectEffect: ; 2eded (b:6ded) ldtx hl, ChooseWeaknessYouWishToChangeText @@ -8704,12 +8211,10 @@ Conversion1_PlayerSelectEffect: ; 2eded (b:6ded) call HandleColorChangeScreen ldh [hTemp_ffa0], a ret -; 0x2edf7 Conversion1_AISelectEffect: ; 2edf7 (b:6df7) call AISelectConversionColor ret -; 0x2edfb Conversion1_ChangeWeaknessEffect: ; 2edfb (b:6dfb) call HandleNoDamageOrEffect @@ -8734,7 +8239,6 @@ Conversion1_ChangeWeaknessEffect: ; 2edfb (b:6dfb) ld a, SUBSTATUS2_CONVERSION2 call ApplySubstatus2ToDefendingCard ret -; 0x2ee1f ; returns carry if Active Pokemon has no Resistance. Conversion2_ResistanceCheck: ; 2ee1f (b:6e1f) @@ -8747,7 +8251,6 @@ Conversion2_ResistanceCheck: ; 2ee1f (b:6e1f) ldtx hl, NoResistanceText scf ret -; 0x2ee31 Conversion2_PlayerSelectEffect: ; 2ee31 (b:6e31) ldtx hl, ChooseResistanceYouWishToChangeText @@ -8755,7 +8258,6 @@ Conversion2_PlayerSelectEffect: ; 2ee31 (b:6e31) call HandleColorChangeScreen ldh [hTemp_ffa0], a ret -; 0x2ee3c Conversion2_AISelectEffect: ; 2ee3c (b:6e3c) ; AI will choose Defending Pokemon's color @@ -8776,7 +8278,6 @@ Conversion2_AISelectEffect: ; 2ee3c (b:6e3c) call AISelectConversionColor call SwapTurn ret -; 0x2ee5e Conversion2_ChangeResistanceEffect: ; 2ee5e (b:6e5e) ; apply changed resistance @@ -8803,7 +8304,6 @@ PrintArenaCardNameAndColorText: ; 2ee6c (b:6e6c) pop hl call DrawWideTextBox_PrintText ret -; 0x2ee7f ; handles AI logic for selecting a new color ; for weakness/resistance. @@ -8884,7 +8384,6 @@ AISelectConversionColor: ; 2ee7f (b:6e7f) and TYPE_PKMN ldh [hTemp_ffa0], a ret -; 0x2eee7 ScrunchEffect: ; 2eee7 (b:6ee7) ldtx de, IfHeadsNoDamageNextTurnText @@ -8895,18 +8394,15 @@ ScrunchEffect: ; 2eee7 (b:6ee7) ld a, SUBSTATUS1_NO_DAMAGE_17 call ApplySubstatus1ToDefendingCard ret -; 0x2eefb ChanseyDoubleEdgeEffect: ; 2eefb (b:6efb) ld a, 80 call DealRecoilDamageToSelf ret -; 0x2ef01 SuperFang_AIEffect: ; 2ef01 (b:6f01) call SuperFang_HalfHPEffect jp SetDefiniteAIDamage -; 0x2ef07 SuperFang_HalfHPEffect: ; 2ef07 (b:6f07) ld a, DUELVARS_ARENA_CARD_HP @@ -8919,7 +8415,6 @@ SuperFang_HalfHPEffect: ; 2ef07 (b:6f07) .rounded call SetDefiniteDamage ret -; 0x2ef18 ; return carry if no Pokemon in Bench TrainerCardAsPokemon_BenchCheck: ; 2ef18 (b:6f18) @@ -8930,7 +8425,6 @@ TrainerCardAsPokemon_BenchCheck: ; 2ef18 (b:6f18) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2ef27 TrainerCardAsPokemon_PlayerSelectSwitch: ; 2ef27 (b:6f27) ldh a, [hTemp_ffa0] @@ -8944,7 +8438,6 @@ TrainerCardAsPokemon_PlayerSelectSwitch: ; 2ef27 (b:6f27) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTempPlayAreaLocation_ffa1], a ret -; 0x2ef3c TrainerCardAsPokemon_DiscardEffect: ; 2ef3c (b:6f3c) ldh a, [hTemp_ffa0] @@ -8959,12 +8452,10 @@ TrainerCardAsPokemon_DiscardEffect: ; 2ef3c (b:6f3c) .shift_cards call ShiftAllPokemonToFirstPlayAreaSlots ret -; 0x2ef51 HealingWind_InitialEffect: ; 2ef51 (b:6f51) scf ret -; 0x2ef53 HealingWind_PlayAreaHealEffect: ; 2ef53 (b:6f53) ; play initial animation @@ -9020,13 +8511,11 @@ HealingWind_PlayAreaHealEffect: ; 2ef53 (b:6f53) jr nz, .loop_play_area ret -; 0x2ef9c Dragonite1Slam_AIEffect: ; 2ef9c (b:6f9c) ld a, (30 * 2) / 2 lb de, 0, 60 jp SetExpectedAIDamage -; 0x2efa4 Dragonite1Slam_MultiplierEffect: ; 2efa4 (b:6fa4) ld hl, 30 @@ -9040,7 +8529,6 @@ Dragonite1Slam_MultiplierEffect: ; 2efa4 (b:6fa4) call ATimes10 call SetDefiniteDamage ret -; 0x2efbc ; possibly unreferenced Func_2efbc: ; 2efbc (b:6fbc) @@ -9056,7 +8544,6 @@ Func_2efbc: ; 2efbc (b:6fbc) dec c jr nz, .asm_2efc7 ret -; 0x2efce ; possibly unreferenced Func_2efce: ; 2efce (b:6fce) @@ -9072,7 +8559,6 @@ Func_2efce: ; 2efce (b:6fce) dec c jr nz, .asm_2efd9 ret -; 0x2efe0 CatPunchEffect: ; 2efe0 (b:6fe0) call SwapTurn @@ -9084,7 +8570,6 @@ CatPunchEffect: ; 2efe0 (b:6fe0) call DealDamageToPlayAreaPokemon call SwapTurn ret -; 0x2eff6 MorphEffect: ; 2eff6 (b:6ff6) call ExchangeRNG @@ -9161,7 +8646,6 @@ MorphEffect: ; 2eff6 (b:6ff6) xor a ld [wDuelDisplayedScreen], a ret -; 0x2f06a ; picks a random Pokemon in the Deck to morph. ; needs to be a Basic Pokemon that doesn't have @@ -9193,7 +8677,6 @@ MorphEffect: ; 2eff6 (b:6ff6) .set_carry scf ret -; 0x2f098 ; returns in a and [hTempCardIndex_ff98] the deck index ; of random Basic Pokemon card in deck. @@ -9221,7 +8704,6 @@ PickRandomBasicCardFromDeck: ; 2f098 (b:7098) .set_carry scf ret -; 0x2f0bf SlicingWindEffect: ; 2f0bf (b:70bf) call SwapTurn @@ -9231,13 +8713,11 @@ SlicingWindEffect: ; 2f0bf (b:70bf) call DealDamageToPlayAreaPokemon_RegularAnim call SwapTurn ret -; 0x2f0d0 Gale_LoadAnimation: ; 2f0d0 (b:70d0) ld a, ATK_ANIM_GALE ld [wLoadedAttackAnimation], a ret -; 0x2f0d6 Gale_SwitchEffect: ; 2f0d6 (b:70d6) ; if Defending card is unaffected by attack @@ -9280,7 +8760,6 @@ Gale_SwitchEffect: ; 2f0d6 (b:70d6) xor a ld [wDuelDisplayedScreen], a ret -; 0x2f10d ; return carry if Bench is full FriendshipSong_BenchCheck: ; 2f10d (b:710d) @@ -9290,7 +8769,6 @@ FriendshipSong_BenchCheck: ; 2f10d (b:710d) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2f119 FriendshipSong_AddToBench50PercentEffect: ; 2f119 (b:7119) ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText @@ -9322,13 +8800,11 @@ FriendshipSong_AddToBench50PercentEffect: ; 2f119 (b:7119) bank1call DisplayCardDetailScreen call Func_2c0bd ret -; 0x2f153 ExpandEffect: ; 2f153 (b:7153) ld a, SUBSTATUS1_REDUCE_BY_10 call ApplySubstatus1ToDefendingCard ret -; 0x2f159 ; returns carry if either there are no damage counters ; or no Energy cards attached in the Play Area. @@ -9339,7 +8815,6 @@ SuperPotion_DamageEnergyCheck: ; 2f159 (b:7159) call CheckIfThereAreAnyEnergyCardsAttached ldtx hl, ThereIsNoEnergyCardAttachedText ret -; 0x2f167 SuperPotion_PlayerSelectEffect: ; 2f167 (b:7167) ldtx hl, ChoosePokemonToRemoveDamageCounterFromText @@ -9392,7 +8867,6 @@ SuperPotion_PlayerSelectEffect: ; 2f167 (b:7167) ldh [hPlayAreaEffectTarget], a or a ret -; 0x2f1b5 SuperPotion_HealEffect: ; 2f1b5 (b:71b5) ldh a, [hTemp_ffa0] @@ -9402,7 +8876,6 @@ SuperPotion_HealEffect: ; 2f1b5 (b:71b5) ldh a, [hPlayAreaEffectTarget] call HealPlayAreaCardHP ret -; 0x2f1c4 ; checks if there is at least one Energy card ; attached to some card in the Turn Duelist's Play Area. @@ -9432,7 +8905,6 @@ CheckIfThereAreAnyEnergyCardsAttached: ; 2f1c4 (b:71c4) .found or a ret -; 0x2f1e7 ; handles Player selection for Pokemon in Play Area, ; then opens screen to choose one of the energy cards @@ -9464,7 +8936,6 @@ HandlePokemonAndEnergySelectionScreen: ; 2f1e7 (b:71e7) ldh a, [hTempCardIndex_ff98] ldh [hTempPlayAreaLocation_ffa1], a ret -; 0x2f216 ImakuniEffect: ; 2f216 (b:7216) ld a, DUELVARS_ARENA_CARD @@ -9505,7 +8976,6 @@ ImakuniEffect: ; 2f216 (b:7216) ld [hl], a bank1call DrawDuelHUDs ret -; 0x2f252 ; returns carry if opponent has no energy cards attached EnergyRemoval_EnergyCheck: ; 2f252 (b:7252) @@ -9514,7 +8984,6 @@ EnergyRemoval_EnergyCheck: ; 2f252 (b:7252) ldtx hl, NoEnergyAttachedToOpponentsActiveText call SwapTurn ret -; 0x2f25f EnergyRemoval_PlayerSelection: ; 2f25f (b:725f) ldtx hl, ChoosePokemonToRemoveEnergyFromText @@ -9523,12 +8992,10 @@ EnergyRemoval_PlayerSelection: ; 2f25f (b:725f) call HandlePokemonAndEnergySelectionScreen call SwapTurn ret -; 0x2f26f EnergyRemoval_AISelection: ; 2f26f (b:726f) call AIPickEnergyCardToDiscardFromDefendingPokemon ret -; 0x2f273 EnergyRemoval_DiscardEffect: ; 2f273 (b:7273) call SwapTurn @@ -9544,7 +9011,6 @@ EnergyRemoval_DiscardEffect: ; 2f273 (b:7273) call Func_2c10b call SwapTurn ret -; 0x2f28e ; return carry if no other card in hand to discard ; or if there are no Basic Energy cards in Discard Pile. @@ -9557,7 +9023,6 @@ EnergyRetrieval_HandEnergyCheck: ; 2f28e (b:728e) call CreateEnergyCardListFromDiscardPile_OnlyBasic ldtx hl, ThereAreNoBasicEnergyCardsInDiscardPileText ret -; 0x2f2a0 EnergyRetrieval_PlayerHandSelection: ; 2f2a0 (b:72a0) ldtx hl, ChooseCardToDiscardFromHandText @@ -9570,7 +9035,6 @@ EnergyRetrieval_PlayerHandSelection: ; 2f2a0 (b:72a0) ldh a, [hTempCardIndex_ff98] ldh [hTempList], a ret -; 0x2f2b9 EnergyRetrieval_PlayerDiscardPileSelection: ; 2f2b9 (b:72b9) ld a, 1 ; start at 1 due to card selected from hand @@ -9607,7 +9071,6 @@ EnergyRetrieval_PlayerDiscardPileSelection: ; 2f2b9 (b:72b9) ld [hl], $ff ; terminating byte or a ret -; 0x2f2f8 EnergyRetrieval_DiscardAndAddToHandEffect: ; 2f2f8 (b:72f8) ld hl, hTempList @@ -9629,7 +9092,6 @@ EnergyRetrieval_DiscardAndAddToHandEffect: ; 2f2f8 (b:72f8) ret c bank1call Func_4b38 ret -; 0x2f31c ; return carry if no cards left in Deck. EnergySearch_DeckCheck: ; 2f31c (b:731c) @@ -9639,7 +9101,6 @@ EnergySearch_DeckCheck: ; 2f31c (b:731c) ccf ldtx hl, NoCardsLeftInTheDeckText ret -; 0x2f328 EnergySearch_PlayerSelection: ; 2f328 (b:7328) ld a, $ff @@ -9683,7 +9144,6 @@ EnergySearch_PlayerSelection: ; 2f328 (b:7328) ldh [hTemp_ffa0], a or a ret -; 0x2f372 EnergySearch_AddToHandEffect: ; 2f372 (b:7372) ldh a, [hTemp_ffa0] @@ -9717,7 +9177,6 @@ CheckIfCardIsBasicEnergy: ; 2f38f (b:738f) .not_basic_energy scf ret -; 0x2f3a1 ProfessorOakEffect: ; 2f3a1 (b:73a1) ; discard hand @@ -9744,13 +9203,11 @@ ProfessorOakEffect: ; 2f3a1 (b:73a1) jr nz, .draw_loop .done ret -; 0x2f3ca Potion_DamageCheck: ; 2f3ca (b:73ca) call CheckIfPlayAreaHasAnyDamage ldtx hl, NoPokemonWithDamageCountersText ret -; 0x2f3d1 Potion_PlayerSelection: ; 2f3d1 (b:73d1) bank1call HasAlivePokemonInPlayArea @@ -9773,7 +9230,6 @@ Potion_PlayerSelection: ; 2f3d1 (b:73d1) ldh [hTempPlayAreaLocation_ffa1], a or a ret -; 0x2f3ef Potion_HealEffect: ; 2f3ef (b:73ef) ldh a, [hTemp_ffa0] @@ -9781,7 +9237,6 @@ Potion_HealEffect: ; 2f3ef (b:73ef) ldh a, [hTempPlayAreaLocation_ffa1] call HealPlayAreaCardHP ret -; 0x2f3f9 GamblerEffect: ; 2f3f9 (b:73f9) ldtx de, CardCheckIfHeads8CardsIfTails1CardText @@ -9825,7 +9280,6 @@ GamblerEffect: ; 2f3f9 (b:73f9) jr nz, .draw_loop .done ret -; 0x2f43b ; return carry if not enough cards in hand to discard ; or if there are no cards in the Discard Pile @@ -9837,7 +9291,6 @@ ItemFinder_HandDiscardPileCheck: ; 2f43b (b:743b) ret c call CreateTrainerCardListFromDiscardPile ret -; 0x2f44a ItemFinder_PlayerSelection: ; 2f44a (b:744a) call HandlePlayerSelection2HandCardsToDiscard @@ -9853,7 +9306,6 @@ ItemFinder_PlayerSelection: ; 2f44a (b:744a) bank1call DisplayCardList ldh [hTempList + 2], a ; placed after the 2 cards selected to discard ret -; 0x2f463 ItemFinder_DiscardAddToHandEffect: ; 2f463 (b:7463) ; discard cards from hand @@ -9876,7 +9328,6 @@ ItemFinder_DiscardAddToHandEffect: ; 2f463 (b:7463) ldtx hl, WasPlacedInTheHandText bank1call DisplayCardDetailScreen ret -; 0x2f488 Defender_PlayerSelection: ; 2f488 (b:7488) ldtx hl, ChoosePokemonToAttachDefenderToText @@ -9886,7 +9337,6 @@ Defender_PlayerSelection: ; 2f488 (b:7488) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2f499 Defender_AttachDefenderEffect: ; 2f499 (b:7499) ; attach Trainer card to Play Area Pokemon @@ -9906,7 +9356,6 @@ Defender_AttachDefenderEffect: ; 2f499 (b:7499) ldh a, [hTemp_ffa0] call Func_2c10b ret -; 0x2f4b3 ; return carry if Bench is full. MysteriousFossil_BenchCheck: ; 2f4b3 (b:74b3) @@ -9916,13 +9365,11 @@ MysteriousFossil_BenchCheck: ; 2f4b3 (b:74b3) ccf ldtx hl, NoSpaceOnTheBenchText ret -; 0x2f4bf MysteriousFossil_PlaceInPlayAreaEffect: ; 2f4bf (b:74bf) ldh a, [hTempCardIndex_ff9f] call PutHandPokemonCardInPlayArea ret -; 0x2f4c5 ; return carry if Arena card has no status to heal. FullHeal_StatusCheck: ; 2f4c5 (b:74c5) @@ -9933,7 +9380,6 @@ FullHeal_StatusCheck: ; 2f4c5 (b:74c5) ldtx hl, NotAffectedByPoisonSleepParalysisOrConfusionText scf ret -; 0x2f4d1 FullHeal_ClearStatusEffect: ; 2f4d1 (b:74d1) ld a, ATK_ANIM_FULL_HEAL @@ -9943,7 +9389,6 @@ FullHeal_ClearStatusEffect: ; 2f4d1 (b:74d1) ld [hl], NO_STATUS bank1call DrawDuelHUDs ret -; 0x2f4e1 ImposterProfessorOakEffect: ; 2f4e1 (b:74e1) call SwapTurn @@ -9975,7 +9420,6 @@ ImposterProfessorOakEffect: ; 2f4e1 (b:74e1) .done call SwapTurn ret -; 0x2f513 ; return carry if not enough cards in hand to discard ; or if there are no cards left in the deck. @@ -9991,12 +9435,10 @@ ComputerSearch_HandDeckCheck: ; 2f513 (b:7513) cp DECK_SIZE ccf ret -; 0x2f52a ComputerSearch_PlayerDiscardHandSelection: ; 2f52a (b:752a) call HandlePlayerSelection2HandCardsToDiscard ret -; 0x2f52e ComputerSearch_PlayerDeckSelection: ; 2f52e (b:752e) call CreateDeckCardList @@ -10009,7 +9451,6 @@ ComputerSearch_PlayerDeckSelection: ; 2f52e (b:752e) jr c, .loop_input ; can't exit with B button ldh [hTempList + 2], a ret -; 0x2f545 ComputerSearch_DiscardAddToHandEffect: ; 2f545 (b:7545) ; discard cards from hand @@ -10027,7 +9468,6 @@ ComputerSearch_DiscardAddToHandEffect: ; 2f545 (b:7545) call AddCardToHand call Func_2c0bd ret -; 0x2f561 ; return carry if Bench is full. ClefairyDoll_BenchCheck: ; 2f561 (b:7561) @@ -10037,13 +9477,11 @@ ClefairyDoll_BenchCheck: ; 2f561 (b:7561) cp MAX_PLAY_AREA_POKEMON ccf ret -; 0x2f56d ClefairyDoll_PlaceInPlayAreaEffect: ; 2f56d (b:756d) ldh a, [hTempCardIndex_ff9f] call PutHandPokemonCardInPlayArea ret -; 0x2f573 ; return carry if no Pokemon in the Bench. MrFuji_BenchCheck: ; 2f573 (b:7573) @@ -10052,7 +9490,6 @@ MrFuji_BenchCheck: ; 2f573 (b:7573) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2f57e MrFuji_PlayerSelection: ; 2f57e (b:757e) ldtx hl, ChoosePokemonToReturnToTheDeckText @@ -10062,7 +9499,6 @@ MrFuji_PlayerSelection: ; 2f57e (b:757e) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2f58f MrFuji_ReturnToDeckEffect: ; 2f58f (b:758f) ; get Play Area location's card index @@ -10120,7 +9556,6 @@ MrFuji_ReturnToDeckEffect: ; 2f58f (b:758f) .done call Func_2c0bd ret -; 0x2f5e0 PlusPowerEffect: ; 2f5e0 (b:75e0) ; attach Trainer card to Arena Pokemon @@ -10133,7 +9568,6 @@ PlusPowerEffect: ; 2f5e0 (b:75e0) call GetTurnDuelistVariable inc [hl] ret -; 0x2f5ee ; return carry if no Pokemon in the Bench. Switch_BenchCheck: ; 2f5ee (b:75ee) @@ -10142,7 +9576,6 @@ Switch_BenchCheck: ; 2f5ee (b:75ee) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2f5f9 Switch_PlayerSelection: ; 2f5f9 (b:75f9) ldtx hl, SelectPkmnOnBenchToSwitchWithActiveText @@ -10152,20 +9585,17 @@ Switch_PlayerSelection: ; 2f5f9 (b:75f9) ldh a, [hTempPlayAreaLocation_ff9d] ldh [hTemp_ffa0], a ret -; 0x2f60a Switch_SwitchEffect: ; 2f60a (b:760a) ldh a, [hTemp_ffa0] ld e, a call SwapArenaWithBenchPokemon ret -; 0x2f611 PokemonCenter_DamageCheck: ; 2f611 (b:7611) call CheckIfPlayAreaHasAnyDamage ldtx hl, NoPokemonWithDamageCountersText ret -; 0x2f618 PokemonCenter_HealDiscardEnergyEffect: ; 2f618 (b:7618) ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -10220,7 +9650,6 @@ PokemonCenter_HealDiscardEnergyEffect: ; 2f618 (b:7618) dec d jr nz, .loop_play_area ret -; 0x2f659 ; return carry if non-Turn Duelist has full Bench ; or if they have no Basic Pokemon cards in Discard Pile. @@ -10237,7 +9666,6 @@ PokemonFlute_BenchCheck: ; 2f659 (b:7659) ldtx hl, ThereAreNoPokemonInDiscardPileText call SwapTurn ret -; 0x2f672 PokemonFlute_PlayerSelection: ; 2f672 (b:7672) ; create Discard Pile list @@ -10254,7 +9682,6 @@ PokemonFlute_PlayerSelection: ; 2f672 (b:7672) ldh a, [hTempCardIndex_ff98] ldh [hTemp_ffa0], a ret -; 0x2f68f PokemonFlute_PlaceInPlayAreaText: ; 2f68f (b:768f) ; place selected card in non-Turn Duelist's Bench @@ -10275,7 +9702,6 @@ PokemonFlute_PlaceInPlayAreaText: ; 2f68f (b:768f) bank1call DisplayCardDetailScreen call SwapTurn ret -; 0x2f6b3 PokemonBreeder_HandPlayAreaCheck: ; 2f6b3 (b:76b3) call CreatePlayableStage2PokemonCardListFromHand @@ -10286,7 +9712,6 @@ PokemonBreeder_HandPlayAreaCheck: ; 2f6b3 (b:76b3) ldtx hl, ConditionsForEvolvingToStage2NotFulfilledText scf ret -; 0x2f6c1 PokemonBreeder_PlayerSelection: ; 2f6c1 (b:76c1) ; create hand list of playable Stage2 cards @@ -10319,7 +9744,6 @@ PokemonBreeder_PlayerSelection: ; 2f6c1 (b:76c1) jr c, .read_input ; loop back if cannot evolve this card or a ret -; 0x2f6f4 PokemonBreeder_EvolveEffect: ; 2f6f4 (b:76f4) ldh a, [hTempCardIndex_ff9f] @@ -10367,7 +9791,6 @@ PokemonBreeder_EvolveEffect: ; 2f6f4 (b:76f4) pop af ldh [hTempCardIndex_ff9f], a ret -; 0x2f73e ; creates list in wDuelTempList of all Stage2 Pokemon cards ; in the hand that can evolve a Basic Pokemon card in Play Area @@ -10448,7 +9871,6 @@ CreatePlayableStage2PokemonCardListFromHand: ; 2f73e (b:773e) pop de scf ret -; 0x2f795 ; return carry if no cards in the Bench. ScoopUp_BenchCheck: ; 2f795 (b:7795) @@ -10457,7 +9879,6 @@ ScoopUp_BenchCheck: ; 2f795 (b:7795) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2f7a0 ScoopUp_PlayerSelection: ; 2f7a0 (b:77a0) ; print text box @@ -10481,7 +9902,6 @@ ScoopUp_PlayerSelection: ; 2f7a0 (b:77a0) bank1call OpenPlayAreaScreenForSelection ldh [hTempPlayAreaLocation_ffa1], a ret -; 0x2f7c3 ScoopUp_ReturnToHandEffect: ; 2f7c3 (b:77c3) ; store chosen card location to Scoop Up @@ -10561,7 +9981,6 @@ ScoopUp_ReturnToHandEffect: ; 2f7c3 (b:77c3) call SwapPlayAreaPokemon call ShiftAllPokemonToFirstPlayAreaSlots ret -; 0x2f826 ; return carry if no other cards in hand, ; or if there are no Pokemon cards in hand. @@ -10574,7 +9993,6 @@ PokemonTrader_HandDeckCheck: ; 2f826 (b:7826) call CreatePokemonCardListFromHand ldtx hl, ThereAreNoCardsInHandThatYouCanChangeText ret -; 0x2f838 PokemonTrader_PlayerHandSelection: ; 2f838 (b:7838) ; print text box @@ -10592,7 +10010,6 @@ PokemonTrader_PlayerHandSelection: ; 2f838 (b:7838) bank1call DisplayCardList ldh [hTemp_ffa0], a ret -; 0x2f853 PokemonTrader_PlayerDeckSelection: ; 2f853 (b:7853) ; temporarily place chosen hand card in deck @@ -10628,7 +10045,6 @@ PokemonTrader_PlayerDeckSelection: ; 2f853 (b:7853) call AddCardToHand or a ret -; 0x2f88d PokemonTrader_TradeCardsEffect: ; 2f88d (b:788d) ; place hand card in deck @@ -10653,7 +10069,6 @@ PokemonTrader_TradeCardsEffect: ; 2f88d (b:788d) .done call Func_2c0bd ret -; 0x2f8b6 ; makes list in wDuelTempList with all Pokemon cards ; that are in Turn Duelist's hand. @@ -10687,7 +10102,6 @@ CreatePokemonCardListFromHand: ; 2f8b6 (b:78b6) .set_carry scf ret -; 0x2f8e1 ; return carry if no cards in deck Pokedex_DeckCheck: ; 2f8e1 (b:78e1) @@ -10697,7 +10111,6 @@ Pokedex_DeckCheck: ; 2f8e1 (b:78e1) cp DECK_SIZE ccf ret -; 0x2f8ed Pokedex_PlayerSelection: ; 2f8ed (b:78ed) ; print text box @@ -10848,7 +10261,6 @@ Pokedex_PlayerSelection: ; 2f8ed (b:78ed) ld [hl], $00 ; overwrite order number with 0 bank1call Func_5744 jr .read_input -; 0x2f9aa Pokedex_OrderDeckCardsEffect: ; 2f9aa (b:79aa) ; place cards in order to the hand. @@ -10873,7 +10285,6 @@ Pokedex_OrderDeckCardsEffect: ; 2f9aa (b:79aa) dec c jr nz, .loop_place_deck ret -; 0x2f9c4 BillEffect: ; 2f9c4 (b:79c4) ld a, 2 @@ -10894,7 +10305,6 @@ BillEffect: ; 2f9c4 (b:79c4) jr nz, .loop_draw .done ret -; 0x2f9e3 LassEffect: ; 2f9e3 (b:79e3) ; first discard Lass card that was used @@ -10945,7 +10355,6 @@ LassEffect: ; 2f9e3 (b:79e3) or a call nz, Func_2c0bd ; only show list if there were any Trainer cards ret -; 0x2fa31 .DisplayLinkOrCPUHand ; 2fa31 (b:7a31) ld a, [wDuelType] @@ -10967,7 +10376,6 @@ LassEffect: ; 2f9e3 (b:79e3) call .DisplayOppHand call SwapTurn ret -; 0x2fa4f .DisplayOppHand ; 2fa4f (b:7a4f) call CreateHandCardList @@ -10984,7 +10392,6 @@ LassEffect: ; 2f9e3 (b:79e3) ldtx hl, DuelistHasNoCardsInHandText call DrawWideTextBox_WaitForInput ret -; 0x2fa70 ; return carry if not enough cards in hand for effect Maintenance_HandCheck: ; 2fa70 (b:7a70) @@ -10993,14 +10400,12 @@ Maintenance_HandCheck: ; 2fa70 (b:7a70) ldtx hl, NotEnoughCardsInHandText cp 3 ret -; 0x2fa7b Maintenance_PlayerSelection: ; 2fa7b (b:7a7b) ldtx hl, Choose2HandCardsFromHandToReturnToDeckText ldtx de, ChooseTheCardToPutBackText call HandlePlayerSelection2HandCards ret -; 0x2fa85 Maintenance_ReturnToDeckAndDrawEffect: ; 2fa85 (b:7a85) ; return both selected cards to the deck @@ -11023,7 +10428,6 @@ Maintenance_ReturnToDeckAndDrawEffect: ; 2fa85 (b:7a85) ; show card on screen if played by Player bank1call DisplayPlayerDrawCardScreen ret -; 0x2faad ; return carry if no cards in deck PokeBall_DeckCheck: ; 2faad (b:7aad) @@ -11033,7 +10437,6 @@ PokeBall_DeckCheck: ; 2faad (b:7aad) cp DECK_SIZE ccf ret -; 0x2fab9 PokeBall_PlayerSelection: ; 2fab9 (b:7ab9) ld de, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -11089,7 +10492,6 @@ PokeBall_PlayerSelection: ; 2fab9 (b:7ab9) cp TYPE_ENERGY jr nc, .loop jr .read_input -; 0x2fb15 PokeBall_AddToHandEffect: ; 2fb15 (b:7b15) ldh a, [hTempList] @@ -11112,7 +10514,6 @@ PokeBall_AddToHandEffect: ; 2fb15 (b:7b15) .done call Func_2c0bd ret -; 0x2fb36 ; return carry if no cards in the Discard Pile Recycle_DiscardPileCheck: ; 2fb36 (b:7b36) @@ -11121,7 +10522,6 @@ Recycle_DiscardPileCheck: ; 2fb36 (b:7b36) ldtx hl, ThereAreNoCardsInTheDiscardPileText cp 1 ret -; 0x2fb41 Recycle_PlayerSelection: ; 2fb41 (b:7b41) ld de, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA @@ -11147,7 +10547,6 @@ Recycle_PlayerSelection: ; 2fb41 (b:7b41) ldh [hTempList], a or a ret -; 0x2fb68 Recycle_AddToHandEffect: ; 2fb68 (b:7b68) ldh a, [hTempList] @@ -11164,7 +10563,6 @@ Recycle_AddToHandEffect: ; 2fb68 (b:7b68) ldtx hl, CardWasChosenText bank1call DisplayCardDetailScreen ret -; 0x2fb80 ; return carry if Bench is full or ; if no Basic Pokemon cards in Discard Pile. @@ -11178,7 +10576,6 @@ Revive_BenchCheck: ; 2fb80 (b:7b80) call CreateBasicPokemonCardListFromDiscardPile ldtx hl, ThereAreNoPokemonInDiscardPileText ret -; 0x2fb93 Revive_PlayerSelection: ; 2fb93 (b:7b93) ; create Basic Pokemon card list from Discard Pile @@ -11197,7 +10594,6 @@ Revive_PlayerSelection: ; 2fb93 (b:7b93) ldh a, [hTempCardIndex_ff98] ldh [hTemp_ffa0], a ret -; 0x2fbb0 Revive_PlaceInPlayAreaEffect: ; 2fbb0 (b:7bb0) ; place selected Pokemon in the Bench @@ -11223,7 +10619,6 @@ Revive_PlaceInPlayAreaEffect: ; 2fbb0 (b:7bb0) ldtx hl, PlacedOnTheBenchText bank1call DisplayCardDetailScreen ret -; 0x2fbd6 ; makes list in wDuelTempList with all Basic Pokemon cards ; that are in Turn Duelist's Discard Pile. @@ -11270,7 +10665,6 @@ CreateBasicPokemonCardListFromDiscardPile: ; 2fbd6 (b:7bd6) .set_carry scf ret -; 0x2fc0b ; return carry if Turn Duelist has no Evolution cards in Play Area DevolutionSpray_PlayAreaEvolutionCheck: ; 2fc0b (b:7c0b) @@ -11290,7 +10684,6 @@ DevolutionSpray_PlayAreaEvolutionCheck: ; 2fc0b (b:7c0b) ldtx hl, ThereAreNoStage1PokemonText scf ret -; 0x2fc24 DevolutionSpray_PlayerSelection: ; 2fc24 (b:7c24) ; display textbox @@ -11382,7 +10775,6 @@ DevolutionSpray_PlayerSelection: ; 2fc24 (b:7c24) ld [hl], b ret -; 0x2fc99 DevolutionSpray_DevolutionEffect: ; 2fc99 (b:7c99) ; first byte in list is Play Area location chosen @@ -11421,7 +10813,6 @@ DevolutionSpray_DevolutionEffect: ; 2fc99 (b:7c99) call PrintPlayAreaCardKnockedOutIfNoHP bank1call Func_6e49 ret -; 0x2fcd0 ; returns carry if neither duelist has any energy cards attached SuperEnergyRemoval_EnergyCheck: ; 2fcd0 (b:7cd0) @@ -11433,7 +10824,6 @@ SuperEnergyRemoval_EnergyCheck: ; 2fcd0 (b:7cd0) ldtx hl, NoEnergyCardsAttachedToPokemonInOppPlayAreaText call SwapTurn ret -; 0x2fce4 SuperEnergyRemoval_PlayerSelection: ; 2fce4 (b:7ce4) ; handle selection of Energy to discard in own Play Area @@ -11518,7 +10908,6 @@ SuperEnergyRemoval_PlayerSelection: ; 2fce4 (b:7ce4) call SwapTurn or a ret -; 0x2fd73 SuperEnergyRemoval_DiscardEffect: ; 2fd73 (b:7d73) ld hl, hTempList + 1 @@ -11554,7 +10943,6 @@ SuperEnergyRemoval_DiscardEffect: ; 2fd73 (b:7d73) call Func_2c10b call SwapTurn ret -; 0x2fda4 ; return carry if not enough cards in hand to ; discard for Super Energy Retrieval effect @@ -11568,12 +10956,10 @@ SuperEnergyRetrieval_HandEnergyCheck: ; 2fda4 (b:7da4) call CreateEnergyCardListFromDiscardPile_OnlyBasic ldtx hl, ThereAreNoBasicEnergyCardsInDiscardPileText ret -; 0x2fdb6 SuperEnergyRetrieval_PlayerHandSelection: ; 2fdb6 (b:7db6) call HandlePlayerSelection2HandCardsToDiscard ret -; 0x2fdba SuperEnergyRetrieval_PlayerDiscardPileSelection: ; 2fdba (b:7dba) ldtx hl, ChooseUpTo4FromDiscardPileText @@ -11612,7 +10998,6 @@ SuperEnergyRetrieval_PlayerDiscardPileSelection: ; 2fdba (b:7dba) ld [hl], $ff or a ret -; 0x2fdfa SuperEnergyRetrieval_DiscardAndAddToHandEffect: ; 2fdfa (b:7dfa) ; discard 2 cards selected from the hand @@ -11643,7 +11028,6 @@ SuperEnergyRetrieval_DiscardAndAddToHandEffect: ; 2fdfa (b:7dfa) ; if not, show card list selected by Opponent bank1call Func_4b38 ret -; 0x2fe25 ; outputs in hl the next position ; in hTempList to place a new card, @@ -11660,7 +11044,6 @@ GetNextPositionInTempList_TrainerEffects: ; 2fe25 (b:7e25) add hl, de pop de ret -; 0x2fe34 ; handles screen for Player to select 2 cards from the hand to discard. ; first prints text informing Player to choose cards to discard @@ -11714,7 +11097,6 @@ HandlePlayerSelection2HandCards: ; 2fe3a (b:7e3a) .set_carry scf ret -; 0x2fe6e ; return carry if non-turn duelist has no benched Pokemon GustOfWind_BenchCheck: ; 2fe6e (b:7e6e) @@ -11723,7 +11105,6 @@ GustOfWind_BenchCheck: ; 2fe6e (b:7e6e) ldtx hl, EffectNoPokemonOnTheBenchText cp 2 ret -; 0x2fe79 GustOfWind_PlayerSelection: ; 2fe79 (b:7e79) ldtx hl, ChooseAPokemonToSwitchWithActivePokemonText @@ -11735,7 +11116,6 @@ GustOfWind_PlayerSelection: ; 2fe79 (b:7e79) ldh [hTemp_ffa0], a call SwapTurn ret -; 0x2fe90 GustOfWind_SwitchEffect: ; 2fe90 (b:7e90) ; play whirlwind animation @@ -11752,7 +11132,6 @@ GustOfWind_SwitchEffect: ; 2fe90 (b:7e90) xor a ld [wDuelDisplayedScreen], a ret -; 0x2fea9 ; input: ; a = attack animation to play @@ -11765,7 +11144,6 @@ Func_2fea9: ; 2fea9 (b:7ea9) bank1call PlayAttackAnimation bank1call WaitAttackAnimation ret -; 0x2febc ; heals amount of damage in register e for card in ; Play Area location in [hTempPlayAreaLocation_ff9d]. @@ -11814,4 +11192,3 @@ HealPlayAreaCardHP: ; 2febc (b:7ebc) add e ld [hl], a ret -; 0x2ff03 diff --git a/src/engine/sequences/credits_sequence_commands.asm b/src/engine/sequences/credits_sequence_commands.asm index 5a7d4eb..9b66fd4 100644 --- a/src/engine/sequences/credits_sequence_commands.asm +++ b/src/engine/sequences/credits_sequence_commands.asm @@ -6,7 +6,6 @@ SetCreditsSequenceCmdPtr: ; 1d7fc (7:57fc) xor a
ld [wSequenceDelay], a
ret
-; 0x1d80b
ExecuteCreditsSequenceCmd: ; 1d80b (7:580b)
ld a, [wSequenceDelay]
@@ -40,7 +39,6 @@ ExecuteCreditsSequenceCmd: ; 1d80b (7:580b) pop hl
call CallHL2
jr ExecuteCreditsSequenceCmd
-; 0x1d834
ret ; stray ret
@@ -74,13 +72,11 @@ AdvanceCreditsSequenceCmdPtr: ; 1d847 (7:5847) ld [hl], a
pop hl
ret
-; 0x1d853
CreditsSequenceCmd_Wait: ; 1d853 (7:5853)
ld a, c
ld [wSequenceDelay], a
jp AdvanceCreditsSequenceCmdPtrBy3
-; 0x1d85a
CreditsSequenceCmd_LoadScene: ; 1d85a (7:585a)
push bc
@@ -99,7 +95,6 @@ CreditsSequenceCmd_LoadScene: ; 1d85a (7:585a) ld a, e
call LoadScene
jp AdvanceCreditsSequenceCmdPtrBy5
-; 0x1d878
CreditsSequenceCmd_LoadBooster: ; 1d878 (7:5878)
push bc
@@ -118,7 +113,6 @@ CreditsSequenceCmd_LoadBooster: ; 1d878 (7:5878) ld a, e
farcall LoadBoosterGfx
jp AdvanceCreditsSequenceCmdPtrBy5
-; 0x1d897
CreditsSequenceCmd_LoadClubMap: ; 1d897 (7:5897)
ld b, $00
@@ -267,7 +261,6 @@ ENDM db NPC_ROD, 14, 6, SOUTH
db NPC_PLAYER_CREDITS, 14, 10, NORTH
db $00
-; 0x1d9a6
; bc = coordinates
; e = OW map
@@ -296,24 +289,20 @@ LoadOWMapForCreditsSequence: ; 1d9a6 (7:59a6) ld a, PALETTE_29
farcall LoadPaletteData
ret
-; 0x1d9d5
CreditsSequenceCmd_LoadOWMap: ; 1d9d5 (7:59d5)
call LoadOWMapForCreditsSequence
jp AdvanceCreditsSequenceCmdPtrBy5
-; 0x1d9db
CreditsSequenceCmd_DisableLCD: ; 1d9db (7:59db)
call DisableLCD
jp AdvanceCreditsSequenceCmdPtrBy2
-; 0x1d9e1
CreditsSequenceCmd_FadeIn: ; 1d9e1 (7:59e1)
call DisableLCD
call Set_WD_on
farcall Func_10af9
jp AdvanceCreditsSequenceCmdPtrBy2
-; 0x1d9ee
CreditsSequenceCmd_FadeOut: ; 1d9ee (7:59ee)
farcall Func_10ab4
@@ -323,7 +312,6 @@ CreditsSequenceCmd_FadeOut: ; 1d9ee (7:59ee) call DisableLCD
call Set_WD_off
jp AdvanceCreditsSequenceCmdPtrBy2
-; 0x1da04
CreditsSequenceCmd_DrawRectangle: ; 1da04 (7:5a04)
ld a, c
@@ -336,7 +324,6 @@ CreditsSequenceCmd_DrawRectangle: ; 1da04 (7:5a04) lb hl, 0, 0
call FillRectangle
jp AdvanceCreditsSequenceCmdPtrBy4
-; 0x1da17
CreditsSequenceCmd_PrintText: ; 1da17 (7:5a17)
ld a, $01
@@ -350,7 +337,6 @@ CreditsSequenceCmd_PrintText: ; 1da17 (7:5a17) pop hl
call PrintTextNoDelay
jp AdvanceCreditsSequenceCmdPtrBy6
-; 0x1da2c
CreditsSequenceCmd_PrintTextBox: ; 1da2c (7:5a2c)
ld a, $01
@@ -362,7 +348,6 @@ CreditsSequenceCmd_PrintTextBox: ; 1da2c (7:5a2c) pop hl
call PrintTextNoDelay
jp AdvanceCreditsSequenceCmdPtrBy6
-; 0x1da3e
CreditsSequenceCmd_InitOverlay: ; 1da3e (7:5a3e)
ld a, c
@@ -375,12 +360,10 @@ CreditsSequenceCmd_InitOverlay: ; 1da3e (7:5a3e) ld [wd64a], a
call Func_1d765
jp AdvanceCreditsSequenceCmdPtrBy6
-; 0x1da54
CreditsSequenceCmd_LoadNPC: ; 1da54 (7:5a54)
call LoadNPCForCreditsSequence
jp AdvanceCreditsSequenceCmdPtrBy6
-; 0x1da5a
; bc = coordinates
; e = direction
@@ -424,12 +407,10 @@ LoadNPCForCreditsSequence: ; 1da5a (7:5a5a) add c
farcall StartNewSpriteAnimation
ret
-; 0x1da9e
CreditsSequenceCmd_InitVolcanoSprite: ; 1da9e (7:5a9e)
farcall OverworldMap_InitVolcanoSprite
jp AdvanceCreditsSequenceCmdPtrBy2
-; 0x1daa5
CreditsSequenceCmd_TransformOverlay: ; 1daa5 (7:5aa5)
; either stretches or shrinks overlay
@@ -481,4 +462,3 @@ CreditsSequenceCmd_TransformOverlay: ; 1daa5 (7:5aa5) inc a
.done
ret
-; 0x1daef
diff --git a/src/engine/sequences/opening_sequence_commands.asm b/src/engine/sequences/opening_sequence_commands.asm index 8846c88..fac3aa7 100644 --- a/src/engine/sequences/opening_sequence_commands.asm +++ b/src/engine/sequences/opening_sequence_commands.asm @@ -27,7 +27,6 @@ ExecuteOpeningSequenceCmd: ; 1d408 (7:5408) call CallHL2
jr c, ExecuteOpeningSequenceCmd
ret
-; 0x1d42e
AdvanceOpeningSequenceCmdPtrBy2: ; 1d42e (7:542e)
ld a, 2
@@ -51,7 +50,6 @@ AdvanceOpeningSequenceCmdPtr: ; 1d438 (7:5438) ld [hl], a
pop hl
ret
-; 0x1d444
OpeningSequenceCmd_WaitOrbsAnimation: ; 1d444 (7:5444)
ld c, $7
@@ -72,7 +70,6 @@ OpeningSequenceCmd_WaitOrbsAnimation: ; 1d444 (7:5444) .no_carry
or a
ret
-; 0x1d460
OpeningSequenceCmd_Wait: ; 1d460 (7:5460)
ld a, c
@@ -80,7 +77,6 @@ OpeningSequenceCmd_Wait: ; 1d460 (7:5460) call AdvanceOpeningSequenceCmdPtrBy3
scf
ret
-; 0x1d469
OpeningSequenceCmd_SetOrbsAnimations: ; 1d469 (7:5469)
ld l, c
@@ -104,7 +100,6 @@ OpeningSequenceCmd_SetOrbsAnimations: ; 1d469 (7:5469) call AdvanceOpeningSequenceCmdPtrBy4
scf
ret
-; 0x1d486
OpeningSequenceCmd_SetOrbsCoordinates: ; 1d486 (7:5486)
ld l, c
@@ -139,7 +134,6 @@ OpeningSequenceCmd_SetOrbsCoordinates: ; 1d486 (7:5486) call AdvanceOpeningSequenceCmdPtrBy4
scf
ret
-; 0x1d4b0
OpeningOrbAnimations_CharizardScene: ; 1d4b0 (7:54b0)
db $c0 ; GRASS
@@ -149,7 +143,6 @@ OpeningOrbAnimations_CharizardScene: ; 1d4b0 (7:54b0) db $c1 ; LIGHTNING
db $c0 ; PSYCHIC
db $c1 ; FIGHTING
-; 0x1d4b7
OpeningOrbCoordinates_CharizardScene: ; 1d4b7 (7:54b7)
; x coord, y coord
@@ -160,7 +153,6 @@ OpeningOrbCoordinates_CharizardScene: ; 1d4b7 (7:54b7) db 160, 84 ; LIGHTNING
db 240, 100 ; PSYCHIC
db 160, 44 ; FIGHTING
-; 0x1d4c5
OpeningOrbAnimations_ScytherScene: ; 1d4c5 (7:54c5)
db $c1 ; GRASS
@@ -170,7 +162,6 @@ OpeningOrbAnimations_ScytherScene: ; 1d4c5 (7:54c5) db $c0 ; LIGHTNING
db $c1 ; PSYCHIC
db $c0 ; FIGHTING
-; 0x1d4cc
OpeningOrbCoordinates_ScytherScene: ; 1d4cc (7:54cc)
; x coord, y coord
@@ -181,7 +172,6 @@ OpeningOrbCoordinates_ScytherScene: ; 1d4cc (7:54cc) db 240, 84 ; LIGHTNING
db 160, 100 ; PSYCHIC
db 240, 44 ; FIGHTING
-; 0x1d4da
OpeningOrbAnimations_AerodactylScene: ; 1d4da (7:54da)
db $c2 ; GRASS
@@ -191,18 +181,16 @@ OpeningOrbAnimations_AerodactylScene: ; 1d4da (7:54da) db $ce ; LIGHTNING
db $d1 ; PSYCHIC
db $d4 ; FIGHTING
-; 0x1d4e1
OpeningOrbCoordinates_AerodactylScene: ; 1d4e1 (7:54e1)
; x coord, y coord
db 240, 32 ; GRASS
db 160, 112 ; FIRE
- db $A0, 16 ; WATER
+ db 160, 16 ; WATER
db 240, 64 ; COLORLESS
db 160, 80 ; LIGHTNING
db 240, 96 ; PSYCHIC
db 160, 48 ; FIGHTING
-; 0x1d4ef
OpeningOrbAnimations_InitialTitleScreen: ; 1d4ef (7:54ef)
db $c3 ; GRASS
@@ -212,7 +200,6 @@ OpeningOrbAnimations_InitialTitleScreen: ; 1d4ef (7:54ef) db $cf ; LIGHTNING
db $d2 ; PSYCHIC
db $d5 ; FIGHTING
-; 0x1d4f6
OpeningOrbCoordinates_InitialTitleScreen: ; 1d4f6 (7:54f6)
; x coord, y coord
@@ -223,7 +210,6 @@ OpeningOrbCoordinates_InitialTitleScreen: ; 1d4f6 (7:54f6) db 52, 144 ; LIGHTNING
db 132, 144 ; PSYCHIC
db 72, 144 ; FIGHTING
-; 0x1d504
OpeningOrbAnimations_InTitleScreen: ; 1d504 (7:5504)
db $c4 ; GRASS
@@ -233,7 +219,6 @@ OpeningOrbAnimations_InTitleScreen: ; 1d504 (7:5504) db $d0 ; LIGHTNING
db $d3 ; PSYCHIC
db $d6 ; FIGHTING
-; 0x1d50b
OpeningOrbCoordinates_InTitleScreen: ; 1d50b (7:550b)
; x coord, y coord
@@ -244,7 +229,6 @@ OpeningOrbCoordinates_InTitleScreen: ; 1d50b (7:550b) db 52, 252 ; LIGHTNING
db 144, 28 ; PSYCHIC
db 72, 76 ; FIGHTING
-; 0x1d519
OpeningSequenceCmd_PlayTitleScreenMusic: ; 1d519 (7:5519)
ld a, MUSIC_TITLESCREEN
@@ -252,7 +236,6 @@ OpeningSequenceCmd_PlayTitleScreenMusic: ; 1d519 (7:5519) call AdvanceOpeningSequenceCmdPtrBy2
scf
ret
-; 0x1d523
OpeningSequenceCmd_WaitSFX: ; 1d523 (7:5523)
call AssertSFXFinished
@@ -265,7 +248,6 @@ OpeningSequenceCmd_WaitSFX: ; 1d523 (7:5523) .no_carry
or a
ret
-; 0x1d530
OpeningSequenceCmd_PlaySFX: ; 1d530 (7:5530)
ld a, c
@@ -273,7 +255,6 @@ OpeningSequenceCmd_PlaySFX: ; 1d530 (7:5530) call AdvanceOpeningSequenceCmdPtrBy3
scf
ret
-; 0x1d539
OpeningSequenceCmd_FadeIn: ; 1d539 (7:5539)
ld a, TRUE
@@ -281,7 +262,6 @@ OpeningSequenceCmd_FadeIn: ; 1d539 (7:5539) call AdvanceOpeningSequenceCmdPtrBy2
scf
ret
-; 0x1d543
OpeningSequenceCmd_FadeOut: ; 1d543 (7:5543)
farcall Func_10d50
@@ -290,7 +270,6 @@ OpeningSequenceCmd_FadeOut: ; 1d543 (7:5543) call AdvanceOpeningSequenceCmdPtrBy2
scf
ret
-; 0x1d551
OpeningSequenceCmd_LoadCharizardScene: ; 1d551 (7:5551)
lb bc, 6, 3
@@ -315,7 +294,6 @@ LoadOpeningSceneAndUpdateSGBBorder: ; 1d564 (7:5564) farcall Func_70498
scf
ret
-; 0x1d575
OpeningSequenceCmd_LoadTitleScreenScene: ; 1d575 (7:5575)
lb bc, 0, 0
@@ -324,7 +302,6 @@ OpeningSequenceCmd_LoadTitleScreenScene: ; 1d575 (7:5575) call OpeningSequenceEmptyFunc
scf
ret
-; 0x1d582
; a = scene ID
; bc = coordinates for scene
@@ -343,8 +320,6 @@ LoadOpeningScene: ; 1d582 (7:5582) call AdvanceOpeningSequenceCmdPtrBy2
call EnableLCD
ret
-; 0x1d59c
OpeningSequenceEmptyFunc: ; 1d59c (7:559c)
ret
-; 0x1d59d
|