From 9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 26 Oct 2020 15:45:57 -0400 Subject: Comment, remove, or revise many unreferenced labels --- data/battle_tower/parties.asm | 22 +++--- data/battle_tower/unknown.asm | 145 ++++++++++++++++++------------------- data/decorations/decorations.asm | 5 +- data/maps/blocks.asm | 96 ++++++++++++------------ data/maps/landmarks.asm | 12 +-- data/moves/animations.asm | 6 +- data/phone/text/elm.asm | 1 - data/phone/text/todd_overworld.asm | 5 +- data/text/battle.asm | 2 +- data/text/common_1.asm | 1 - data/text/common_2.asm | 5 +- data/text/common_3.asm | 16 ---- data/text/unused_sweet_honey.asm | 16 ++-- 13 files changed, 156 insertions(+), 176 deletions(-) (limited to 'data') diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm index e0d2b4dec..9c67c2f72 100644 --- a/data/battle_tower/parties.asm +++ b/data/battle_tower/parties.asm @@ -1,7 +1,7 @@ BattleTowerMons: -; 10 groups of 21 mons. +; 10 groups (one per floor level) of 21 mons (BATTLETOWER_NUM_UNIQUE_MON). -BattleTowerMons1: +; BattleTowerMons group 1 db JOLTEON db MIRACLEBERRY @@ -550,7 +550,7 @@ BattleTowerMons1: db "BARIYA-DO@@" -BattleTowerMons2: +; BattleTowerMons group 2 db UMBREON db LEFTOVERS @@ -1099,7 +1099,7 @@ BattleTowerMons2: db "NUO-@@@@@@@" -BattleTowerMons3: +; BattleTowerMons group 3 db JOLTEON db MIRACLEBERRY @@ -1648,7 +1648,7 @@ BattleTowerMons3: db "OKORIZARU@@" -BattleTowerMons4: +; BattleTowerMons group 4 db TAUROS db GOLD_BERRY @@ -2197,7 +2197,7 @@ BattleTowerMons4: db "EREBU-@@@@@" -BattleTowerMons5: +; BattleTowerMons group 5 db KINGDRA db GOLD_BERRY @@ -2746,7 +2746,7 @@ BattleTowerMons5: db "HURI-ZA-@@@" -BattleTowerMons6: +; BattleTowerMons group 6 db KINGDRA db LEFTOVERS @@ -3295,7 +3295,7 @@ BattleTowerMons6: db "GORO-NIya@@" -BattleTowerMons7: +; BattleTowerMons group 7 db JOLTEON db MIRACLEBERRY @@ -3844,7 +3844,7 @@ BattleTowerMons7: db "KAMEtuKUSU@" -BattleTowerMons8: +; BattleTowerMons group 8 db JOLTEON db MIRACLEBERRY @@ -4393,7 +4393,7 @@ BattleTowerMons8: db "GURANBURU@@" -BattleTowerMons9: +; BattleTowerMons group 9 db UMBREON db KINGS_ROCK @@ -4942,7 +4942,7 @@ BattleTowerMons9: db "BETOBETON@@" -BattleTowerMons10: +; BattleTowerMons group 10 db HOUNDOOM db MINT_BERRY diff --git a/data/battle_tower/unknown.asm b/data/battle_tower/unknown.asm index 81c9515fb..3437c444b 100644 --- a/data/battle_tower/unknown.asm +++ b/data/battle_tower/unknown.asm @@ -1,8 +1,8 @@ -BattleTowerTrainerData:: ; What exactly it is, I don't know -; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied) +BattleTowerTrainerData:: ; ??? +; 70 tables (BATTLETOWER_NUM_UNIQUE_TRAINERS) of 18 two-argument entries (total size BATTLETOWER_TRAINERDATALENGTH). ; Second argument points to an entry in Unknown_170470, to which the first argument is compared. -BattleTowerTrainer1DataTable: +; BattleTowerTrainerData table 1: db $37, 3 db $0e, 9 db $25, 11 @@ -22,7 +22,7 @@ BattleTowerTrainer1DataTable: db $34, 3 db $06, 5 -BattleTowerTrainer2DataTable: +; BattleTowerTrainerData table 2: db $36, 3 db $ca, 0 db $22, 8 @@ -42,7 +42,7 @@ BattleTowerTrainer2DataTable: db $28, 11 db $0c, 13 -BattleTowerTrainer3DataTable: +; BattleTowerTrainerData table 3: db $32, 6 db $31, 4 db $02, 2 @@ -62,7 +62,7 @@ BattleTowerTrainer3DataTable: db $22, 2 db $13, 13 -BattleTowerTrainer4DataTable: +; BattleTowerTrainerData table 4: db $22, 12 db $22, 12 db $0a, 9 @@ -82,7 +82,7 @@ BattleTowerTrainer4DataTable: db $1c, 11 db $41, 11 -BattleTowerTrainer5DataTable: +; BattleTowerTrainerData table 5: db $a3, 0 db $41, 3 db $1f, 4 @@ -102,7 +102,7 @@ BattleTowerTrainer5DataTable: db $d1, 0 db $0a, 6 -BattleTowerTrainer6DataTable: +; BattleTowerTrainerData table 6: db $13, 2 db $31, 6 db $04, 2 @@ -122,7 +122,7 @@ BattleTowerTrainer6DataTable: db $08, 5 db $1a, 13 -BattleTowerTrainer7DataTable: +; BattleTowerTrainerData table 7: db $0d, 2 db $07, 2 db $00, 5 @@ -142,7 +142,7 @@ BattleTowerTrainer7DataTable: db $20, 4 db $23, 13 -BattleTowerTrainer8DataTable: +; BattleTowerTrainerData table 8: db $1e, 2 db $22, 2 db $00, 5 @@ -162,7 +162,7 @@ BattleTowerTrainer8DataTable: db $14, 8 db $00, 5 -BattleTowerTrainer9DataTable: +; BattleTowerTrainerData table 9: db $06, 12 db $09, 6 db $00, 0 @@ -182,7 +182,7 @@ BattleTowerTrainer9DataTable: db $31, 13 db $01, 5 -BattleTowerTrainer10DataTable: +; BattleTowerTrainerData table 10: db $22, 12 db $30, 4 db $01, 5 @@ -202,7 +202,7 @@ BattleTowerTrainer10DataTable: db $30, 13 db $06, 5 -BattleTowerTrainer11DataTable: +; BattleTowerTrainerData table 11: db $0e, 6 db $04, 5 db $2c, 4 @@ -222,7 +222,7 @@ BattleTowerTrainer11DataTable: db $26, 13 db $04, 5 -BattleTowerTrainer12DataTable: +; BattleTowerTrainerData table 12: db $18, 2 db $33, 3 db $28, 4 @@ -242,7 +242,7 @@ BattleTowerTrainer12DataTable: db $0f, 2 db $00, 5 -BattleTowerTrainer13DataTable: +; BattleTowerTrainerData table 13: db $3a, 11 db $3a, 11 db $00, 5 @@ -262,7 +262,7 @@ BattleTowerTrainer13DataTable: db $3a, 8 db $2a, 13 -BattleTowerTrainer14DataTable: +; BattleTowerTrainerData table 14: db $31, 5 db $11, 14 db $30, 4 @@ -282,7 +282,7 @@ BattleTowerTrainer14DataTable: db $3b, 7 db $0e, 13 -BattleTowerTrainer15DataTable: +; BattleTowerTrainerData table 15: db $1b, 2 db $2c, 4 db $0d, 13 @@ -302,7 +302,7 @@ BattleTowerTrainer15DataTable: db $06, 5 db $00, 0 -BattleTowerTrainer16DataTable: +; BattleTowerTrainerData table 16: db $42, 3 db $30, 4 db $1f, 11 @@ -322,7 +322,7 @@ BattleTowerTrainer16DataTable: db $36, 8 db $41, 13 -BattleTowerTrainer17DataTable: +; BattleTowerTrainerData table 17: db $18, 3 db $42, 3 db $43, 4 @@ -342,7 +342,7 @@ BattleTowerTrainer17DataTable: db $3f, 4 db $20, 14 -BattleTowerTrainer18DataTable: +; BattleTowerTrainerData table 18: db $0c, 5 db $36, 7 db $30, 4 @@ -362,7 +362,7 @@ BattleTowerTrainer18DataTable: db $30, 7 db $06, 5 -BattleTowerTrainer19DataTable: +; BattleTowerTrainerData table 19: db $36, 3 db $06, 6 db $44, 4 @@ -382,7 +382,7 @@ BattleTowerTrainer19DataTable: db $05, 13 db $00, 0 -BattleTowerTrainer20DataTable: +; BattleTowerTrainerData table 20: db $3f, 6 db $2c, 4 db $34, 13 @@ -402,7 +402,7 @@ BattleTowerTrainer20DataTable: db $34, 7 db $04, 13 -BattleTowerTrainer21DataTable: +; BattleTowerTrainerData table 21: db $12, 3 db $02, 4 db $07, 7 @@ -422,7 +422,7 @@ BattleTowerTrainer21DataTable: db $28, 11 db $02, 5 -BattleTowerTrainer22DataTable: +; BattleTowerTrainerData table 22: db $41, 4 db $3c, 11 db $34, 13 @@ -442,7 +442,7 @@ BattleTowerTrainer22DataTable: db $0c, 4 db $3b, 13 -BattleTowerTrainer23DataTable: +; BattleTowerTrainerData table 23: db $03, 10 db $3a, 13 db $2c, 4 @@ -462,7 +462,7 @@ BattleTowerTrainer23DataTable: db $13, 4 db $04, 5 -BattleTowerTrainer24DataTable: +; BattleTowerTrainerData table 24: db $06, 5 db $06, 5 db $06, 5 @@ -482,7 +482,7 @@ BattleTowerTrainer24DataTable: db $33, 4 db $03, 5 -BattleTowerTrainer25DataTable: +; BattleTowerTrainerData table 25: db $27, 5 db $01, 5 db $00, 0 @@ -502,7 +502,7 @@ BattleTowerTrainer25DataTable: db $0c, 4 db $19, 13 -BattleTowerTrainer26DataTable: +; BattleTowerTrainerData table 26: db $03, 2 db $43, 3 db $27, 4 @@ -522,7 +522,7 @@ BattleTowerTrainer26DataTable: db $20, 4 db $41, 13 -BattleTowerTrainer27DataTable: +; BattleTowerTrainerData table 27: db $34, 3 db $00, 3 db $11, 13 @@ -542,7 +542,7 @@ BattleTowerTrainer27DataTable: db $0d, 6 db $20, 6 -BattleTowerTrainer28DataTable: +; BattleTowerTrainerData table 28: db $19, 3 db $17, 11 db $20, 6 @@ -562,7 +562,7 @@ BattleTowerTrainer28DataTable: db $06, 12 db $1a, 11 -BattleTowerTrainer29DataTable: +; BattleTowerTrainerData table 29: db $0a, 3 db $0c, 12 db $25, 10 @@ -582,7 +582,7 @@ BattleTowerTrainer29DataTable: db $0a, 9 db $2f, 13 -BattleTowerTrainer30DataTable: +; BattleTowerTrainerData table 30: db $15, 2 db $2c, 4 db $03, 2 @@ -602,7 +602,7 @@ BattleTowerTrainer30DataTable: db $0c, 4 db $3b, 13 -BattleTowerTrainer31DataTable: +; BattleTowerTrainerData table 31: db $10, 11 db $04, 4 db $00, 5 @@ -622,7 +622,7 @@ BattleTowerTrainer31DataTable: db $13, 7 db $16, 13 -BattleTowerTrainer32DataTable: +; BattleTowerTrainerData table 32: db $0f, 14 db $19, 13 db $00, 5 @@ -642,7 +642,7 @@ BattleTowerTrainer32DataTable: db $19, 13 db $01, 5 -BattleTowerTrainer33DataTable: +; BattleTowerTrainerData table 33: db $35, 3 db $06, 4 db $0d, 6 @@ -662,7 +662,7 @@ BattleTowerTrainer33DataTable: db $29, 8 db $03, 5 -BattleTowerTrainer34DataTable: +; BattleTowerTrainerData table 34: db $18, 4 db $03, 5 db $0b, 13 @@ -682,7 +682,7 @@ BattleTowerTrainer34DataTable: db $0c, 6 db $1a, 13 -BattleTowerTrainer35DataTable: +; BattleTowerTrainerData table 35: db $0c, 12 db $37, 3 db $1a, 3 @@ -702,7 +702,7 @@ BattleTowerTrainer35DataTable: db $3b, 8 db $1b, 7 -BattleTowerTrainer36DataTable: +; BattleTowerTrainerData table 36: db $18, 3 db $1b, 8 db $29, 11 @@ -722,7 +722,7 @@ BattleTowerTrainer36DataTable: db $2f, 8 db $27, 6 -BattleTowerTrainer37DataTable: +; BattleTowerTrainerData table 37: db $1c, 3 db $02, 14 db $31, 3 @@ -742,7 +742,7 @@ BattleTowerTrainer37DataTable: db $27, 4 db $34, 13 -BattleTowerTrainer38DataTable: +; BattleTowerTrainerData table 38: db $33, 3 db $30, 4 db $2c, 4 @@ -762,7 +762,7 @@ BattleTowerTrainer38DataTable: db $40, 6 db $22, 7 -BattleTowerTrainer39DataTable: +; BattleTowerTrainerData table 39: db $22, 12 db $22, 12 db $16, 10 @@ -782,7 +782,7 @@ BattleTowerTrainer39DataTable: db $2c, 4 db $26, 7 -BattleTowerTrainer40DataTable: +; BattleTowerTrainerData table 40: db $0e, 6 db $05, 8 db $04, 13 @@ -802,7 +802,7 @@ BattleTowerTrainer40DataTable: db $00, 0 db $00, 0 -BattleTowerTrainer41DataTable: +; BattleTowerTrainerData table 41: db $18, 3 db $27, 3 db $03, 5 @@ -822,7 +822,7 @@ BattleTowerTrainer41DataTable: db $2f, 8 db $06, 5 -BattleTowerTrainer42DataTable: +; BattleTowerTrainerData table 42: db $36, 3 db $30, 4 db $17, 4 @@ -842,7 +842,7 @@ BattleTowerTrainer42DataTable: db $07, 13 db $3b, 13 -BattleTowerTrainer43DataTable: +; BattleTowerTrainerData table 43: db $0b, 5 db $14, 6 db $24, 4 @@ -862,7 +862,7 @@ BattleTowerTrainer43DataTable: db $00, 2 db $07, 5 -BattleTowerTrainer44DataTable: +; BattleTowerTrainerData table 44: db $0a, 3 db $32, 7 db $0b, 14 @@ -882,7 +882,7 @@ BattleTowerTrainer44DataTable: db $1e, 6 db $14, 7 -BattleTowerTrainer45DataTable: +; BattleTowerTrainerData table 45: db $0e, 6 db $2c, 4 db $00, 13 @@ -902,7 +902,7 @@ BattleTowerTrainer45DataTable: db $31, 4 db $21, 13 -BattleTowerTrainer46DataTable: +; BattleTowerTrainerData table 46: db $22, 5 db $07, 14 db $30, 4 @@ -922,7 +922,7 @@ BattleTowerTrainer46DataTable: db $3f, 4 db $06, 5 -BattleTowerTrainer47DataTable: +; BattleTowerTrainerData table 47: db $3a, 7 db $3b, 7 db $36, 3 @@ -942,7 +942,7 @@ BattleTowerTrainer47DataTable: db $3f, 4 db $0c, 13 -BattleTowerTrainer48DataTable: +; BattleTowerTrainerData table 48: db $43, 3 db $20, 4 db $41, 13 @@ -962,7 +962,7 @@ BattleTowerTrainer48DataTable: db $39, 4 db $41, 13 -BattleTowerTrainer49DataTable: +; BattleTowerTrainerData table 49: db $36, 3 db $16, 4 db $08, 6 @@ -982,7 +982,7 @@ BattleTowerTrainer49DataTable: db $2c, 13 db $00, 5 -BattleTowerTrainer50DataTable: +; BattleTowerTrainerData table 50: db $11, 5 db $25, 3 db $33, 4 @@ -1002,7 +1002,7 @@ BattleTowerTrainer50DataTable: db $19, 13 db $06, 5 -BattleTowerTrainer51DataTable: +; BattleTowerTrainerData table 51: db $2c, 4 db $0a, 13 db $04, 5 @@ -1022,7 +1022,7 @@ BattleTowerTrainer51DataTable: db $29, 8 db $05, 13 -BattleTowerTrainer52DataTable: +; BattleTowerTrainerData table 52: db $05, 3 db $1b, 4 db $41, 3 @@ -1042,7 +1042,7 @@ BattleTowerTrainer52DataTable: db $1d, 11 db $03, 5 -BattleTowerTrainer53DataTable: +; BattleTowerTrainerData table 53: db $1c, 12 db $20, 6 db $05, 8 @@ -1062,7 +1062,7 @@ BattleTowerTrainer53DataTable: db $06, 5 db $1f, 8 -BattleTowerTrainer54DataTable: +; BattleTowerTrainerData table 54: db $37, 3 db $0e, 1 db $08, 1 @@ -1082,7 +1082,7 @@ BattleTowerTrainer54DataTable: db $41, 8 db $3b, 13 -BattleTowerTrainer55DataTable: +; BattleTowerTrainerData table 55: db $06, 2 db $00, 5 db $34, 3 @@ -1102,7 +1102,7 @@ BattleTowerTrainer55DataTable: db $1b, 4 db $0c, 13 -BattleTowerTrainer56DataTable: +; BattleTowerTrainerData table 56: db $2c, 4 db $13, 9 db $20, 6 @@ -1122,7 +1122,7 @@ BattleTowerTrainer56DataTable: db $06, 13 db $3b, 13 -BattleTowerTrainer57DataTable: +; BattleTowerTrainerData table 57: db $06, 3 db $20, 4 db $24, 13 @@ -1142,7 +1142,7 @@ BattleTowerTrainer57DataTable: db $09, 6 db $06, 5 -BattleTowerTrainer58DataTable: +; BattleTowerTrainerData table 58: db $44, 7 db $23, 11 db $33, 13 @@ -1162,7 +1162,7 @@ BattleTowerTrainer58DataTable: db $11, 8 db $41, 13 -BattleTowerTrainer59DataTable: +; BattleTowerTrainerData table 59: db $36, 3 db $06, 6 db $30, 4 @@ -1182,7 +1182,7 @@ BattleTowerTrainer59DataTable: db $0b, 6 db $27, 6 -BattleTowerTrainer60DataTable: +; BattleTowerTrainerData table 60: db $14, 5 db $04, 2 db $09, 14 @@ -1202,7 +1202,7 @@ BattleTowerTrainer60DataTable: db $39, 4 db $00, 5 -BattleTowerTrainer61DataTable: +; BattleTowerTrainerData table 61: db $34, 3 db $00, 3 db $11, 13 @@ -1222,7 +1222,7 @@ BattleTowerTrainer61DataTable: db $1e, 6 db $14, 13 -BattleTowerTrainer62DataTable: +; BattleTowerTrainerData table 62: db $37, 5 db $37, 5 db $00, 5 @@ -1242,7 +1242,7 @@ BattleTowerTrainer62DataTable: db $16, 5 db $01, 5 -BattleTowerTrainer63DataTable: +; BattleTowerTrainerData table 63: db $1f, 14 db $36, 4 db $40, 13 @@ -1262,7 +1262,7 @@ BattleTowerTrainer63DataTable: db $27, 13 db $00, 0 -BattleTowerTrainer64DataTable: +; BattleTowerTrainerData table 64: db $41, 8 db $0b, 6 db $37, 3 @@ -1282,7 +1282,7 @@ BattleTowerTrainer64DataTable: db $28, 6 db $06, 5 -BattleTowerTrainer65DataTable: +; BattleTowerTrainerData table 65: db $0c, 8 db $2c, 4 db $1c, 11 @@ -1302,7 +1302,7 @@ BattleTowerTrainer65DataTable: db $20, 6 db $22, 7 -BattleTowerTrainer66DataTable: +; BattleTowerTrainerData table 66: db $22, 12 db $22, 12 db $0a, 9 @@ -1322,7 +1322,7 @@ BattleTowerTrainer66DataTable: db $02, 7 db $04, 5 -BattleTowerTrainer67DataTable: +; BattleTowerTrainerData table 67: db $2d, 11 db $02, 8 db $37, 13 @@ -1342,7 +1342,7 @@ BattleTowerTrainer67DataTable: db $10, 5 db $04, 5 -BattleTowerTrainer68DataTable: +; BattleTowerTrainerData table 68: db $3f, 3 db $16, 14 db $3f, 8 @@ -1362,7 +1362,7 @@ BattleTowerTrainer68DataTable: db $26, 7 db $03, 5 -BattleTowerTrainer69DataTable: +; BattleTowerTrainerData table 69: db $3a, 6 db $2c, 3 db $12, 3 @@ -1382,7 +1382,7 @@ BattleTowerTrainer69DataTable: db $1b, 7 db $00, 5 -BattleTowerTrainer70DataTable: +; BattleTowerTrainerData table 70: db $1b, 2 db $00, 5 db $0c, 8 @@ -1401,4 +1401,3 @@ BattleTowerTrainer70DataTable: db $22, 7 db $d1, 0 db $32, 13 -BattleTowerTrainerDataEnd: diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm index 947bca1b9..e3ec28f1c 100644 --- a/data/decorations/decorations.asm +++ b/data/decorations/decorations.asm @@ -48,7 +48,8 @@ DecorationIDs: db DECO_BIG_SNORLAX_DOLL ; 1a db DECO_BIG_ONIX_DOLL ; 1b db DECO_BIG_LAPRAS_DOLL ; 1c -TrophyIDs: + db DECO_GOLD_TROPHY_DOLL ; 33 db DECO_SILVER_TROPHY_DOLL ; 34 - db -1 + + db -1 ; end diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 747bfefe4..0c59e4fc1 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -15,7 +15,7 @@ Route44_Blocks: Route28_Blocks: INCBIN "maps/Route28.blk" -BetaPlayersHouse2F_Blocks: +BetaPlayersHouse2F_Blocks: ; unreferenced INCBIN "maps/unused/BetaPlayersHouse2F.blk" CeladonCity_Blocks: @@ -30,25 +30,25 @@ Route2_Blocks: ElmsHouse_Blocks: INCBIN "maps/ElmsHouse.blk" -BetaSproutTower1_Blocks: +BetaSproutTower1_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower1.blk" Route11_Blocks: INCBIN "maps/Route11.blk" -BetaSproutTower5_Blocks: +BetaSproutTower5_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower5.blk" Route15_Blocks: INCBIN "maps/Route15.blk" -BetaSproutTower9_Blocks: +BetaSproutTower9_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower9.blk" Route19_Blocks: INCBIN "maps/Route19.blk" -BetaBlackthornCity_Blocks: +BetaBlackthornCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaBlackthornCity.blk" Route10South_Blocks: @@ -94,7 +94,7 @@ Route25_Blocks: Route24_Blocks: INCBIN "maps/Route24.blk" -BetaVioletCity_Blocks: +BetaVioletCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaVioletCity.blk" Route3_Blocks: @@ -103,25 +103,25 @@ Route3_Blocks: PewterCity_Blocks: INCBIN "maps/PewterCity.blk" -BetaSilverCaveOutside_Blocks: +BetaSilverCaveOutside_Blocks: ; unreferenced INCBIN "maps/unused/BetaSilverCaveOutside.blk" -BetaSproutTower2_Blocks: +BetaSproutTower2_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower2.blk" Route12_Blocks: INCBIN "maps/Route12.blk" -BetaGoldenrodCity_Blocks: +BetaGoldenrodCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaGoldenrodCity.blk" Route20_Blocks: INCBIN "maps/Route20.blk" -BetaSproutTower6_Blocks: +BetaSproutTower6_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower6.blk" -BetaPokecenter_Blocks: +BetaPokecenter_Blocks: ; unreferenced INCBIN "maps/unused/BetaPokecenter.blk" Route30_Blocks: @@ -145,7 +145,7 @@ FuchsiaCity_Blocks: Route38_Blocks: INCBIN "maps/Route38.blk" -BetaCianwoodCity_Blocks: +BetaCianwoodCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaCianwoodCity.blk" OlivineTimsHouse_Blocks: @@ -214,10 +214,10 @@ Route29Route46Gate_Blocks: Route5SaffronGate_Blocks: INCBIN "maps/NorthSouthGate.blk" -BetaEcruteakCity_Blocks: +BetaEcruteakCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaEcruteakCity.blk" -BetaCherrygroveCity_Blocks: +BetaCherrygroveCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaCherrygroveCity.blk" CinnabarIsland_Blocks: @@ -229,7 +229,7 @@ Route4_Blocks: Route8_Blocks: INCBIN "maps/Route8.blk" -BetaSproutTower3_Blocks: +BetaSproutTower3_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower3.blk" ViridianCity_Blocks: @@ -241,13 +241,13 @@ Route13_Blocks: Route21_Blocks: INCBIN "maps/Route21.blk" -BetaSproutTower7_Blocks: +BetaSproutTower7_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower7.blk" Route17_Blocks: INCBIN "maps/Route17.blk" -BetaMahoganyTown_Blocks: +BetaMahoganyTown_Blocks: ; unreferenced INCBIN "maps/unused/BetaMahoganyTown.blk" Route31_Blocks: @@ -280,16 +280,16 @@ Route17Route18Gate_Blocks: Route31VioletGate_Blocks: INCBIN "maps/EastWestGate.blk" -BetaAzaleaTown_Blocks: +BetaAzaleaTown_Blocks: ; unreferenced INCBIN "maps/unused/BetaAzaleaTown.blk" VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk" -BetaOlivineCity_Blocks: +BetaOlivineCity_Blocks: ; unreferenced INCBIN "maps/unused/BetaOlivineCity.blk" -BetaNewBarkTown_Blocks: +BetaNewBarkTown_Blocks: ; unreferenced INCBIN "maps/unused/BetaNewBarkTown.blk" ElmsLab_Blocks: @@ -316,7 +316,7 @@ SECTION "Map Blocks 2", ROMX Route14_Blocks: INCBIN "maps/Route14.blk" -BetaSproutTower8_Blocks: +BetaSproutTower8_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTower8.blk" OlivineMart_Blocks: @@ -337,7 +337,7 @@ CherrygroveMart_Blocks: Route10North_Blocks: INCBIN "maps/Route10North.blk" -BetaLakeOfRage_Blocks: +BetaLakeOfRage_Blocks: ; unreferenced INCBIN "maps/unused/BetaLakeOfRage.blk" OlivinePokecenter1F_Blocks: @@ -363,25 +363,25 @@ SaffronPokecenter1F_Blocks: CherrygrovePokecenter1F_Blocks: INCBIN "maps/Pokecenter1F.blk" -BetaPewterMuseumOfScience1F_Blocks: +BetaPewterMuseumOfScience1F_Blocks: ; unreferenced INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk" -BetaPewterMuseumOfScience2F_Blocks: +BetaPewterMuseumOfScience2F_Blocks: ; unreferenced INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk" EarlsPokemonAcademy_Blocks: INCBIN "maps/EarlsPokemonAcademy.blk" -BetaCinnabarPokemonLabHallway_Blocks: +BetaCinnabarPokemonLabHallway_Blocks: ; unreferenced INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk" -BetaCinnabarPokemonLabRoom1_Blocks: +BetaCinnabarPokemonLabRoom1_Blocks: ; unreferenced INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk" -BetaCinnabarPokemonLabRoom2_Blocks: +BetaCinnabarPokemonLabRoom2_Blocks: ; unreferenced INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk" -BetaCinnabarPokemonLabRoom3_Blocks: +BetaCinnabarPokemonLabRoom3_Blocks: ; unreferenced INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk" GoldenrodDeptStore1F_Blocks: @@ -424,7 +424,7 @@ CeladonMansion3F_Blocks: CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk" -BetaHouse_Blocks: +BetaHouse_Blocks: ; unreferenced INCBIN "maps/unused/BetaHouse.blk" CeladonGameCorner_Blocks: @@ -446,7 +446,7 @@ VioletNicknameSpeechHouse_Blocks: VioletKylesHouse_Blocks: INCBIN "maps/House2.blk" -BetaUnionCave_Blocks: +BetaUnionCave_Blocks: ; unreferenced INCBIN "maps/unused/BetaUnionCave.blk" UnionCaveB1F_Blocks: @@ -466,7 +466,7 @@ Route5UndergroundPathEntrance_Blocks: Route6UndergroundPathEntrance_Blocks: INCBIN "maps/UndergroundPathEntrance.blk" -BetaCapsuleHouse_Blocks: +BetaCapsuleHouse_Blocks: ; unreferenced INCBIN "maps/unused/BetaCapsuleHouse.blk" KurtsHouse_Blocks: @@ -478,7 +478,7 @@ GoldenrodMagnetTrainStation_Blocks: RuinsOfAlphOutside_Blocks: INCBIN "maps/RuinsOfAlphOutside.blk" -BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: +BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: ; unreferenced INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" RuinsOfAlphInnerChamber_Blocks: @@ -493,19 +493,19 @@ RuinsOfAlphAerodactylChamber_Blocks: SproutTower1F_Blocks: INCBIN "maps/SproutTower1F.blk" -BetaSproutTowerCutOut1_Blocks: +BetaSproutTowerCutOut1_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTowerCutOut1.blk" SproutTower2F_Blocks: INCBIN "maps/SproutTower2F.blk" -BetaSproutTowerCutOut2_Blocks: +BetaSproutTowerCutOut2_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTowerCutOut2.blk" SproutTower3F_Blocks: INCBIN "maps/SproutTower3F.blk" -BetaSproutTowerCutOut3_Blocks: +BetaSproutTowerCutOut3_Blocks: ; unreferenced INCBIN "maps/unused/BetaSproutTowerCutOut3.blk" RadioTower1F_Blocks: @@ -583,7 +583,7 @@ GoldenrodDeptStoreB1F_Blocks: GoldenrodUndergroundWarehouse_Blocks: INCBIN "maps/GoldenrodUndergroundWarehouse.blk" -BetaElevator_Blocks: +BetaElevator_Blocks: ; unreferenced INCBIN "maps/unused/BetaElevator.blk" TinTower1F_Blocks: @@ -622,7 +622,7 @@ BurnedTower1F_Blocks: BurnedTowerB1F_Blocks: INCBIN "maps/BurnedTowerB1F.blk" -BetaCaveTestMap_Blocks: +BetaCaveTestMap_Blocks: ; unreferenced INCBIN "maps/unused/BetaCaveTestMap.blk" MountMortar1FOutside_Blocks: @@ -685,16 +685,16 @@ SilverCaveRoom2_Blocks: SilverCaveRoom3_Blocks: INCBIN "maps/SilverCaveRoom3.blk" -BetaRocketHideoutB2F_Blocks: +BetaRocketHideoutB2F_Blocks: ; unreferenced INCBIN "maps/unused/BetaRocketHideoutB2F.blk" -BetaRocketHideoutB1F_Blocks: +BetaRocketHideoutB1F_Blocks: ; unreferenced INCBIN "maps/unused/BetaRocketHideoutB1F.blk" -BetaRocketHideout1F_Blocks: +BetaRocketHideout1F_Blocks: ; unreferenced INCBIN "maps/unused/BetaRocketHideout1F.blk" -BetaRocketHideoutB3F_Blocks: +BetaRocketHideoutB3F_Blocks: ; unreferenced INCBIN "maps/unused/BetaRocketHideoutB3F.blk" MahoganyMart1F_Blocks: @@ -710,7 +710,7 @@ TeamRocketBaseB2F_Blocks: TeamRocketBaseB3F_Blocks: INCBIN "maps/TeamRocketBaseB3F.blk" -BetaRoute23_Blocks: +BetaRoute23_Blocks: ; unreferenced INCBIN "maps/unused/BetaRoute23.blk" IndigoPlateauPokecenter1F_Blocks: @@ -746,7 +746,7 @@ MahoganyGym_Blocks: OlivineGym_Blocks: INCBIN "maps/OlivineGym.blk" -BetaUnknownGym_Blocks: +BetaUnknownGym_Blocks: ; unreferenced INCBIN "maps/unused/BetaUnknownGym.blk" CianwoodGym_Blocks: @@ -779,7 +779,7 @@ OlivineLighthouse6F_Blocks: SECTION "Map Blocks 3", ROMX -BetaSlowpokeWell1F_Blocks: +BetaSlowpokeWell1F_Blocks: ; unreferenced INCBIN "maps/unused/BetaSlowpokeWell1F.blk" SlowpokeWellB1F_Blocks: @@ -824,7 +824,7 @@ FastShip1F_Blocks: FastShipB1F_Blocks: INCBIN "maps/FastShipB1F.blk" -BetaFastShipInsideCutOut_Blocks: +BetaFastShipInsideCutOut_Blocks: ; unreferenced INCBIN "maps/unused/BetaFastShipInsideCutOut.blk" FastShipCabins_NNW_NNE_NE_Blocks: @@ -913,13 +913,13 @@ PewterGym_Blocks: CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" -BetaCeladonMansion1F_Blocks: +BetaCeladonMansion1F_Blocks: ; unreferenced INCBIN "maps/unused/BetaCeladonMansion1F.blk" CeladonCafe_Blocks: INCBIN "maps/CeladonCafe.blk" -BetaCeladonMansion2F_Blocks: +BetaCeladonMansion2F_Blocks: ; unreferenced INCBIN "maps/unused/BetaCeladonMansion2F.blk" RockTunnel1F_Blocks: @@ -1040,7 +1040,7 @@ BattleTowerElevator_Blocks: BattleTowerOutside_Blocks: INCBIN "maps/BattleTowerOutside.blk" -BetaBlank_Blocks: +BetaBlank_Blocks: ; unreferenced INCBIN "maps/unused/BetaBlank.blk" GoldenrodDeptStoreRoof_Blocks: diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index d34b85987..9a28ee52e 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -128,7 +128,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@" MtMortarName: db "MT.MORTAR@" DragonsDenName: db "DRAGON'S¯DEN@" IcePathName: db "ICE PATH@" -NotApplicableName: db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese +NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese PalletTownName: db "PALLET TOWN@" ViridianCityName: db "VIRIDIAN¯CITY@" PewterCityName: db "PEWTER CITY@" @@ -144,11 +144,11 @@ VictoryRoadName: db "VICTORY¯ROAD@" MtMoonName: db "MT.MOON@" RockTunnelName: db "ROCK TUNNEL@" LavRadioTowerName: db "LAV¯RADIO TOWER@" -SilphCoName: db "SILPH CO.@" -SafariZoneName: db "SAFARI ZONE@" +SilphCoName: db "SILPH CO.@" ; unreferenced +SafariZoneName: db "SAFARI ZONE@" ; unreferenced SeafoamIslandsName: db "SEAFOAM¯ISLANDS@" -PokemonMansionName: db "#MON¯MANSION@" -CeruleanCaveName: db "CERULEAN¯CAVE@" +PokemonMansionName: db "#MON¯MANSION@" ; unreferenced +CeruleanCaveName: db "CERULEAN¯CAVE@" ; unreferenced Route1Name: db "ROUTE 1@" Route2Name: db "ROUTE 2@" Route3Name: db "ROUTE 3@" @@ -199,7 +199,7 @@ DarkCaveName: db "DARK CAVE@" IlexForestName: db "ILEX¯FOREST@" BurnedTowerName: db "BURNED¯TOWER@" FastShipName: db "FAST SHIP@" -ViridianForestName: db "VIRIDIAN¯FOREST@" +ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced DiglettsCaveName: db "DIGLETT'S¯CAVE@" TohjoFallsName: db "TOHJO FALLS@" UndergroundName: db "UNDERGROUND@" diff --git a/data/moves/animations.asm b/data/moves/animations.asm index e022ed98f..bba0d186f 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -481,7 +481,7 @@ BattleAnim_SendOutMon: BattleAnim_ReturnMon: anim_sound 0, 0, SFX_BALL_POOF -.anim: +BattleAnimSub_Return: anim_bgeffect ANIM_BG_RETURN_MON, $0, BG_EFFECT_USER, $0 anim_wait 32 anim_ret @@ -1314,7 +1314,7 @@ BattleAnim_RazorWind: anim_wait 24 anim_ret -BattleAnim_Sonicboom_JP: +BattleAnim_Sonicboom_JP: ; unreferenced anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT .loop anim_sound 3, 0, SFX_RAZOR_WIND @@ -4106,7 +4106,7 @@ BattleAnim_BatonPass: anim_1gfx ANIM_GFX_MISC anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20 anim_sound 0, 0, SFX_BATON_PASS - anim_call BattleAnim_ReturnMon.anim + anim_call BattleAnimSub_Return anim_wait 64 anim_ret diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm index 8685367f0..611f41e24 100644 --- a/data/phone/text/elm.asm +++ b/data/phone/text/elm.asm @@ -197,7 +197,6 @@ ElmPhoneGiftText: para "See you later!" done -; unused ElmPhoneGotAholdOfSomethingNeatText: text "Hello, ?" line "How's it going?" diff --git a/data/phone/text/todd_overworld.asm b/data/phone/text/todd_overworld.asm index 6b4e9dd4c..11e34e9a8 100644 --- a/data/phone/text/todd_overworld.asm +++ b/data/phone/text/todd_overworld.asm @@ -57,9 +57,8 @@ ToddRematchText: line "my #MON better!" done -UnusedText_0xa43ca: -; This is unused; Todd says this during the department store sale, -; but this is a duplicate of the actual string in the Route 34 scripts. +ToddSaleText: ; unreferenced +; This is a duplicate of CamperToddSaleText in maps/Route34.asm. text "Shopping under the" line "sky!" diff --git a/data/text/battle.asm b/data/text/battle.asm index 48d0ff483..072ab50d9 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1102,7 +1102,7 @@ BattleText_LinkErrorBattleCanceled: line "been canceled…" prompt -BattleText_0x8188e: +BattleText_NoTimeLeftToday: ; unreferenced text "There is no time" line "left today!" done diff --git a/data/text/common_1.asm b/data/text/common_1.asm index e585a6320..a07617e2c 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -463,7 +463,6 @@ _MobileForPartnersMonText:: text "." done -; unreferenced _MobilePlayersMonTradeText:: text_ram wPlayerTrademonSenderName text "'s" diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 4b01a5294..71b610454 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -263,12 +263,12 @@ _MysteryGiftSentHomeText:: _MysteryGiftReceivedCardText:: text "Received" line "@" - text_ram wc850 + text_ram wMysteryGiftCardHolderName text "'s CARD." prompt _MysteryGiftListedCardText:: - text_ram wc850 + text_ram wMysteryGiftCardHolderName text "'s CARD was" line "listed as no.@" text_decimal wDeciramBuffer, 1, 2 @@ -487,7 +487,6 @@ _RodNothingText:: text "Not even a nibble!" prompt -; unreferenced _UnusedNothingHereText:: text "Looks like there's" line "nothing here." diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 95342d174..cc5a53c2e 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -620,7 +620,6 @@ _PharmacyComeAgainText:: line "See you around." done -; unreferenced _NothingToSellText:: text "You don't have" line "anything to sell." @@ -744,25 +743,21 @@ _MainMenuTimeUnknownText:: text "Clock time unknown" done -; unreferenced mobile _DeleteSavedLoginPasswordText:: text "Delete the saved" line "LOG-IN PASSWORD?" done -; unreferenced mobile _DeletedTheLoginPasswordText:: text "Deleted the LOG-IN" line "PASSWORD." done -; unreferenced mobile _MobilePickThreeMonForBattle:: text "Pick three #MON" line "for battle." prompt -; unreferenced mobile _MobileUseTheseThreeMonText:: text_ram wMobileParticipant1Nickname text "," @@ -776,13 +771,11 @@ _MobileUseTheseThreeMonText:: para "Use these three?" done -; unreferenced mobile _MobileOnlyThreeMonMayEnterText:: text "Only three #MON" line "may enter." prompt -; unreferenced mobile _MobileCardFolderIntro1Text:: text "The CARD FOLDER" line "stores your and" @@ -800,7 +793,6 @@ _MobileCardFolderIntro1Text:: para "" done -; unreferenced mobile _MobileCardFolderIntro2Text:: text "This is your CARD." @@ -814,7 +806,6 @@ _MobileCardFolderIntro2Text:: para "" done -; unreferenced mobile _MobileCardFolderIntro3Text:: text "If you have your" line "friend's CARD, you" @@ -829,7 +820,6 @@ _MobileCardFolderIntro3Text:: para "" done -; unreferenced mobile _MobileCardFolderIntro4Text:: text "To safely store" line "your collection of" @@ -841,7 +831,6 @@ _MobileCardFolderIntro4Text:: para "" done -; unreferenced mobile _MobileCardFolderAskDeleteText:: text "If the CARD FOLDER" line "is deleted, all" @@ -858,13 +847,11 @@ _MobileCardFolderAskDeleteText:: line "your CARD FOLDER?" done -; unreferenced mobile _MobileCardFolderDeleteAreYouSureText:: text "Are you sure you" line "want to delete it?" done -; unreferenced mobile _MobileCardFolderDeletedText:: text "The CARD FOLDER" line "has been deleted." @@ -872,7 +859,6 @@ _MobileCardFolderDeletedText:: para "" done -; unreferenced mobile _MobileCardFolderAskOpenOldText:: text "There is an older" line "CARD FOLDER from a" @@ -882,13 +868,11 @@ _MobileCardFolderAskOpenOldText:: line "open it?" done -; unreferenced mobile _MobileCardFolderAskDeleteOldText:: text "Delete the old" line "CARD FOLDER?" done -; unreferenced mobile _MobileCardFolderFinishRegisteringCardsText:: text "Finish registering" line "CARDS?" diff --git a/data/text/unused_sweet_honey.asm b/data/text/unused_sweet_honey.asm index 04ceae2e6..d4970118a 100644 --- a/data/text/unused_sweet_honey.asm +++ b/data/text/unused_sweet_honey.asm @@ -8,7 +8,7 @@ ; Most of these texts seem to be associated with a single NPC. ; The last text is associated with a second NPC, probably a Butterfree. -UnusedSweetHoneyText: +UnusedSweetHoneyText: ; unreferenced text "My #MON is an" line "expert at collect-" cont "ing SWEET HONEY." @@ -17,7 +17,7 @@ UnusedSweetHoneyText: line "with you." done -UnusedSweetHoneyBagFullText: +UnusedSweetHoneyBagFullText: ; unreferenced text "I want to give you" line "some SWEET HONEY," @@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText: line "room for it." done -UnusedSweetHoneyGiveText: +UnusedSweetHoneyGiveText: ; unreferenced text "Here you go! Have" line "some SWEET HONEY!" done -UnusedGotSweetHoneyText: +UnusedGotSweetHoneyText: ; unreferenced text " received" line "SWEET HONEY." done -UnusedSweetHoneyAfterText1: +UnusedSweetHoneyAfterText1: ; unreferenced text "My little brother" line "takes SWEET HONEY" @@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1: line "up to?" done -UnusedSweetHoneyAfterText2: +UnusedSweetHoneyAfterText2: ; unreferenced text "Did you put SWEET" line "HONEY on a tree?" @@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2: line "it?" done -UnusedSweetHoneyAfterText3: +UnusedSweetHoneyAfterText3: ; unreferenced text "Did you put SWEET" line "HONEY on a tree?" @@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3: cont "be drawn to it." done -UnusedSweetHoneyButterfreeText: +UnusedSweetHoneyButterfreeText: ; unreferenced text "BUTTERFREE: Freeh!" done -- cgit v1.2.3 From 2738858985dbcff55c2ec237ac6075b4263f3120 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 27 Oct 2020 10:00:56 -0400 Subject: Create data/collision/ for tile collision-related data --- data/collision/collision_permissions.asm | 258 +++++++++++++++++++++++++++++++ data/collision/collision_stdscripts.asm | 18 +++ data/collision/field_move_blocks.asm | 55 +++++++ data/collision_permissions.asm | 258 ------------------------------- data/events/collision_stdscripts.asm | 18 --- data/events/field_move_blocks.asm | 52 ------- 6 files changed, 331 insertions(+), 328 deletions(-) create mode 100644 data/collision/collision_permissions.asm create mode 100644 data/collision/collision_stdscripts.asm create mode 100644 data/collision/field_move_blocks.asm delete mode 100644 data/collision_permissions.asm delete mode 100644 data/events/collision_stdscripts.asm delete mode 100644 data/events/field_move_blocks.asm (limited to 'data') diff --git a/data/collision/collision_permissions.asm b/data/collision/collision_permissions.asm new file mode 100644 index 000000000..57172ca51 --- /dev/null +++ b/data/collision/collision_permissions.asm @@ -0,0 +1,258 @@ +TileCollisionTable:: +; entries correspond to COLL_* constants + db LAND_TILE ; COLL_FLOOR + db LAND_TILE ; COLL_01 + db LAND_TILE ; 02 + db LAND_TILE ; COLL_03 + db LAND_TILE ; COLL_04 + db LAND_TILE ; 05 + db LAND_TILE ; 06 + db WALL_TILE ; COLL_WALL + db LAND_TILE ; COLL_CUT_08 + db LAND_TILE ; 09 + db LAND_TILE ; 0a + db LAND_TILE ; 0b + db LAND_TILE ; 0c + db LAND_TILE ; 0d + db LAND_TILE ; 0e + db WALL_TILE ; 0f + db LAND_TILE ; COLL_TALL_GRASS_10 + db LAND_TILE ; 11 + db WALL_TILE | TALK ; COLL_CUT_TREE + db LAND_TILE ; 13 + db LAND_TILE ; COLL_LONG_GRASS + db WALL_TILE | TALK ; COLL_HEADBUTT_TREE + db LAND_TILE ; 16 + db LAND_TILE ; 17 + db LAND_TILE ; COLL_TALL_GRASS + db LAND_TILE ; 19 + db WALL_TILE | TALK ; COLL_CUT_TREE_1A + db LAND_TILE ; 1b + db LAND_TILE ; COLL_LONG_GRASS_1C + db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D + db LAND_TILE ; 1e + db LAND_TILE ; 1f + db WATER_TILE ; 20 + db WATER_TILE ; COLL_WATER_21 + db WATER_TILE | TALK ; 22 + db LAND_TILE ; COLL_ICE + db WATER_TILE | TALK ; COLL_WHIRLPOOL + db WATER_TILE ; 25 + db WATER_TILE ; 26 + db WALL_TILE ; COLL_BUOY + db WATER_TILE ; COLL_CUT_28 + db WATER_TILE ; COLL_WATER + db WATER_TILE | TALK ; 2a + db LAND_TILE ; COLL_ICE_2B + db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C + db WATER_TILE ; 2d + db WATER_TILE ; 2e + db WALL_TILE ; 2f + db WATER_TILE ; COLL_WATERFALL_RIGHT + db WATER_TILE ; COLL_WATERFALL_LEFT + db WATER_TILE ; COLL_WATERFALL_UP + db WATER_TILE ; COLL_WATERFALL + db WATER_TILE ; 34 + db WATER_TILE ; 35 + db WATER_TILE ; 36 + db WATER_TILE ; 37 + db WATER_TILE ; COLL_CURRENT_RIGHT + db WATER_TILE ; COLL_CURRENT_LEFT + db WATER_TILE ; COLL_CURRENT_UP + db WATER_TILE ; COLL_CURRENT_DOWN + db WATER_TILE ; 3c + db WATER_TILE ; 3d + db WATER_TILE ; 3e + db WATER_TILE ; 3f + db LAND_TILE ; COLL_BRAKE + db LAND_TILE ; COLL_WALK_RIGHT + db LAND_TILE ; COLL_WALK_LEFT + db LAND_TILE ; COLL_WALK_UP + db LAND_TILE ; COLL_WALK_DOWN + db LAND_TILE ; COLL_BRAKE_45 + db LAND_TILE ; COLL_BRAKE_46 + db LAND_TILE ; COLL_BRAKE_47 + db LAND_TILE ; COLL_GRASS_48 + db LAND_TILE ; COLL_GRASS_49 + db LAND_TILE ; COLL_GRASS_4A + db LAND_TILE ; COLL_GRASS_4B + db LAND_TILE ; COLL_GRASS_4C + db LAND_TILE ; 4d + db LAND_TILE ; 4e + db LAND_TILE ; 4f + db LAND_TILE ; COLL_WALK_RIGHT_ALT + db LAND_TILE ; COLL_WALK_LEFT_ALT + db LAND_TILE ; COLL_WALK_UP_ALT + db LAND_TILE ; COLL_WALK_DOWN_ALT + db LAND_TILE ; COLL_BRAKE_ALT + db LAND_TILE ; COLL_BRAKE_55 + db LAND_TILE ; COLL_BRAKE_56 + db LAND_TILE ; COLL_BRAKE_57 + db LAND_TILE ; 58 + db LAND_TILE ; 59 + db LAND_TILE ; 5a + db LAND_TILE ; COLL_5B + db LAND_TILE ; 5c + db LAND_TILE ; 5d + db LAND_TILE ; 5e + db LAND_TILE ; 5f + db LAND_TILE ; COLL_PIT + db LAND_TILE ; COLL_VIRTUAL_BOY + db WALL_TILE ; 62 + db LAND_TILE ; 63 + db LAND_TILE ; COLL_64 + db LAND_TILE ; COLL_65 + db LAND_TILE ; 66 + db LAND_TILE ; 67 + db LAND_TILE ; COLL_PIT_68 + db LAND_TILE ; 69 + db WALL_TILE ; 6a + db LAND_TILE ; 6b + db LAND_TILE ; 6c + db LAND_TILE ; 6d + db LAND_TILE ; 6e + db LAND_TILE ; 6f + db LAND_TILE ; COLL_WARP_CARPET_DOWN + db LAND_TILE ; COLL_DOOR + db LAND_TILE ; COLL_LADDER + db LAND_TILE ; COLL_STAIRCASE_73 + db LAND_TILE ; COLL_CAVE_74 + db LAND_TILE ; COLL_DOOR_75 + db LAND_TILE ; COLL_WARP_CARPET_LEFT + db LAND_TILE ; COLL_WARP_77 + db LAND_TILE ; COLL_WARP_CARPET_UP + db LAND_TILE ; COLL_DOOR_79 + db LAND_TILE ; COLL_STAIRCASE + db LAND_TILE ; COLL_CAVE + db LAND_TILE ; COLL_WARP_PANEL + db LAND_TILE ; COLL_DOOR_7D + db LAND_TILE ; COLL_WARP_CARPET_RIGHT + db LAND_TILE ; COLL_WARP_7F + db WALL_TILE ; 80 + db WALL_TILE ; 81 + db WALL_TILE ; 82 + db WALL_TILE ; 83 + db WALL_TILE ; 84 + db LAND_TILE ; 85 + db LAND_TILE ; 86 + db LAND_TILE ; 87 + db WALL_TILE ; 88 + db WALL_TILE ; 89 + db WALL_TILE ; 8a + db WALL_TILE ; 8b + db WALL_TILE ; 8c + db LAND_TILE ; 8d + db LAND_TILE ; 8e + db LAND_TILE ; 8f + db WALL_TILE ; COLL_COUNTER + db WALL_TILE ; COLL_BOOKSHELF + db WALL_TILE ; 92 + db WALL_TILE ; COLL_PC + db WALL_TILE ; COLL_RADIO + db WALL_TILE ; COLL_TOWN_MAP + db WALL_TILE ; COLL_MART_SHELF + db WALL_TILE ; COLL_TV + db WALL_TILE ; COLL_COUNTER_98 + db WALL_TILE ; 99 + db WALL_TILE ; 9a + db WALL_TILE ; 9b + db WALL_TILE ; COLL_9C + db WALL_TILE ; COLL_WINDOW + db WALL_TILE ; 9e + db WALL_TILE ; COLL_INCENSE_BURNER + db LAND_TILE ; COLL_HOP_RIGHT + db LAND_TILE ; COLL_HOP_LEFT + db LAND_TILE ; COLL_HOP_UP + db LAND_TILE ; COLL_HOP_DOWN + db LAND_TILE ; COLL_HOP_DOWN_RIGHT + db LAND_TILE ; COLL_HOP_DOWN_LEFT + db LAND_TILE ; COLL_HOP_UP_RIGHT + db LAND_TILE ; COLL_HOP_UP_LEFT + db LAND_TILE ; a8 + db LAND_TILE ; a9 + db LAND_TILE ; aa + db LAND_TILE ; ab + db LAND_TILE ; ac + db LAND_TILE ; ad + db LAND_TILE ; ae + db LAND_TILE ; af + db LAND_TILE ; COLL_RIGHT_WALL + db LAND_TILE ; COLL_LEFT_WALL + db LAND_TILE ; COLL_UP_WALL + db LAND_TILE ; COLL_DOWN_WALL + db LAND_TILE ; COLL_DOWN_RIGHT_WALL + db LAND_TILE ; COLL_DOWN_LEFT_WALL + db LAND_TILE ; COLL_UP_RIGHT_WALL + db LAND_TILE ; COLL_UP_LEFT_WALL + db LAND_TILE ; b8 + db LAND_TILE ; b9 + db LAND_TILE ; ba + db LAND_TILE ; bb + db LAND_TILE ; bc + db LAND_TILE ; bd + db LAND_TILE ; be + db LAND_TILE ; bf + db WATER_TILE ; COLL_RIGHT_BUOY + db WATER_TILE ; COLL_LEFT_BUOY + db WATER_TILE ; COLL_UP_BUOY + db WATER_TILE ; COLL_DOWN_BUOY + db WATER_TILE ; COLL_DOWN_RIGHT_BUOY + db WATER_TILE ; COLL_DOWN_LEFT_BUOY + db WATER_TILE ; COLL_UP_RIGHT_BUOY + db WATER_TILE ; COLL_UP_LEFT_BUOY + db WATER_TILE ; c8 + db WATER_TILE ; c9 + db WATER_TILE ; ca + db WATER_TILE ; cb + db WATER_TILE ; cc + db WATER_TILE ; cd + db WATER_TILE ; ce + db WATER_TILE ; cf + db LAND_TILE ; d0 + db LAND_TILE ; d1 + db LAND_TILE ; d2 + db LAND_TILE ; d3 + db LAND_TILE ; d4 + db LAND_TILE ; d5 + db LAND_TILE ; d6 + db LAND_TILE ; d7 + db LAND_TILE ; d8 + db LAND_TILE ; d9 + db LAND_TILE ; da + db LAND_TILE ; db + db LAND_TILE ; dc + db LAND_TILE ; dd + db LAND_TILE ; de + db LAND_TILE ; df + db LAND_TILE ; e0 + db LAND_TILE ; e1 + db LAND_TILE ; e2 + db LAND_TILE ; e3 + db LAND_TILE ; e4 + db LAND_TILE ; e5 + db LAND_TILE ; e6 + db LAND_TILE ; e7 + db LAND_TILE ; e8 + db LAND_TILE ; e9 + db LAND_TILE ; ea + db LAND_TILE ; eb + db LAND_TILE ; ec + db LAND_TILE ; ed + db LAND_TILE ; ee + db LAND_TILE ; ef + db LAND_TILE ; f0 + db LAND_TILE ; f1 + db LAND_TILE ; f2 + db LAND_TILE ; f3 + db LAND_TILE ; f4 + db LAND_TILE ; f5 + db LAND_TILE ; f6 + db LAND_TILE ; f7 + db LAND_TILE ; f8 + db LAND_TILE ; f9 + db LAND_TILE ; fa + db LAND_TILE ; fb + db LAND_TILE ; fc + db LAND_TILE ; fd + db LAND_TILE ; fe + db WALL_TILE ; COLL_FF diff --git a/data/collision/collision_stdscripts.asm b/data/collision/collision_stdscripts.asm new file mode 100644 index 000000000..5c94c62f9 --- /dev/null +++ b/data/collision/collision_stdscripts.asm @@ -0,0 +1,18 @@ +; std scripts associated with tile collisions + +stdcoll: MACRO + db \1 + dw (\2StdScript - StdScripts) / 3 +ENDM + +TileCollisionStdScripts: + ; collision type, std script + stdcoll COLL_BOOKSHELF, MagazineBookshelfScript + stdcoll COLL_PC, PCScript + stdcoll COLL_RADIO, Radio1Script + stdcoll COLL_TOWN_MAP, TownMapScript + stdcoll COLL_MART_SHELF, MerchandiseShelfScript + stdcoll COLL_TV, TVScript + stdcoll COLL_WINDOW, WindowScript + stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript + db -1 ; end diff --git a/data/collision/field_move_blocks.asm b/data/collision/field_move_blocks.asm new file mode 100644 index 000000000..444be14bb --- /dev/null +++ b/data/collision/field_move_blocks.asm @@ -0,0 +1,55 @@ +; these blocks all use COLL_CUT_TREE in one quadrant +CutTreeBlockPointers: +; tileset, block list pointer + dbw TILESET_JOHTO, .johto + dbw TILESET_JOHTO_MODERN, .johto_modern + dbw TILESET_KANTO, .kanto + dbw TILESET_PARK, .park + dbw TILESET_FOREST, .forest + db -1 ; end + +.johto: +; facing block, replacement block, animation + db $03, $02, 1 ; grass + db $5b, $3c, 0 ; tree + db $5f, $3d, 0 ; tree + db $63, $3f, 0 ; tree + db $67, $3e, 0 ; tree + db -1 ; end + +.johto_modern: +; facing block, replacement block, animation + db $03, $02, $01 ; grass + db -1 ; end + +.kanto: +; facing block, replacement block, animation + db $0b, $0a, 1 ; grass + db $32, $6d, 0 ; tree + db $33, $6c, 0 ; tree + db $34, $6f, 0 ; tree + db $35, $4c, 0 ; tree + db $60, $6e, 0 ; tree + db -1 ; end + +.park: +; facing block, replacement block, animation + db $13, $03, 1 ; grass + db $03, $04, 1 ; grass + db -1 ; end + +.forest: +; facing block, replacement block, animation + db $0f, $17, 0 + db -1 ; end + + +; these blocks all use COLL_WHIRLPOOL in one quadrant +WhirlpoolBlockPointers: + dbw TILESET_JOHTO, .johto + db -1 ; end + +.johto: +; facing block, replacement block, animation + db $07, $36, 0 + db -1 ; end diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm deleted file mode 100644 index 57172ca51..000000000 --- a/data/collision_permissions.asm +++ /dev/null @@ -1,258 +0,0 @@ -TileCollisionTable:: -; entries correspond to COLL_* constants - db LAND_TILE ; COLL_FLOOR - db LAND_TILE ; COLL_01 - db LAND_TILE ; 02 - db LAND_TILE ; COLL_03 - db LAND_TILE ; COLL_04 - db LAND_TILE ; 05 - db LAND_TILE ; 06 - db WALL_TILE ; COLL_WALL - db LAND_TILE ; COLL_CUT_08 - db LAND_TILE ; 09 - db LAND_TILE ; 0a - db LAND_TILE ; 0b - db LAND_TILE ; 0c - db LAND_TILE ; 0d - db LAND_TILE ; 0e - db WALL_TILE ; 0f - db LAND_TILE ; COLL_TALL_GRASS_10 - db LAND_TILE ; 11 - db WALL_TILE | TALK ; COLL_CUT_TREE - db LAND_TILE ; 13 - db LAND_TILE ; COLL_LONG_GRASS - db WALL_TILE | TALK ; COLL_HEADBUTT_TREE - db LAND_TILE ; 16 - db LAND_TILE ; 17 - db LAND_TILE ; COLL_TALL_GRASS - db LAND_TILE ; 19 - db WALL_TILE | TALK ; COLL_CUT_TREE_1A - db LAND_TILE ; 1b - db LAND_TILE ; COLL_LONG_GRASS_1C - db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D - db LAND_TILE ; 1e - db LAND_TILE ; 1f - db WATER_TILE ; 20 - db WATER_TILE ; COLL_WATER_21 - db WATER_TILE | TALK ; 22 - db LAND_TILE ; COLL_ICE - db WATER_TILE | TALK ; COLL_WHIRLPOOL - db WATER_TILE ; 25 - db WATER_TILE ; 26 - db WALL_TILE ; COLL_BUOY - db WATER_TILE ; COLL_CUT_28 - db WATER_TILE ; COLL_WATER - db WATER_TILE | TALK ; 2a - db LAND_TILE ; COLL_ICE_2B - db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C - db WATER_TILE ; 2d - db WATER_TILE ; 2e - db WALL_TILE ; 2f - db WATER_TILE ; COLL_WATERFALL_RIGHT - db WATER_TILE ; COLL_WATERFALL_LEFT - db WATER_TILE ; COLL_WATERFALL_UP - db WATER_TILE ; COLL_WATERFALL - db WATER_TILE ; 34 - db WATER_TILE ; 35 - db WATER_TILE ; 36 - db WATER_TILE ; 37 - db WATER_TILE ; COLL_CURRENT_RIGHT - db WATER_TILE ; COLL_CURRENT_LEFT - db WATER_TILE ; COLL_CURRENT_UP - db WATER_TILE ; COLL_CURRENT_DOWN - db WATER_TILE ; 3c - db WATER_TILE ; 3d - db WATER_TILE ; 3e - db WATER_TILE ; 3f - db LAND_TILE ; COLL_BRAKE - db LAND_TILE ; COLL_WALK_RIGHT - db LAND_TILE ; COLL_WALK_LEFT - db LAND_TILE ; COLL_WALK_UP - db LAND_TILE ; COLL_WALK_DOWN - db LAND_TILE ; COLL_BRAKE_45 - db LAND_TILE ; COLL_BRAKE_46 - db LAND_TILE ; COLL_BRAKE_47 - db LAND_TILE ; COLL_GRASS_48 - db LAND_TILE ; COLL_GRASS_49 - db LAND_TILE ; COLL_GRASS_4A - db LAND_TILE ; COLL_GRASS_4B - db LAND_TILE ; COLL_GRASS_4C - db LAND_TILE ; 4d - db LAND_TILE ; 4e - db LAND_TILE ; 4f - db LAND_TILE ; COLL_WALK_RIGHT_ALT - db LAND_TILE ; COLL_WALK_LEFT_ALT - db LAND_TILE ; COLL_WALK_UP_ALT - db LAND_TILE ; COLL_WALK_DOWN_ALT - db LAND_TILE ; COLL_BRAKE_ALT - db LAND_TILE ; COLL_BRAKE_55 - db LAND_TILE ; COLL_BRAKE_56 - db LAND_TILE ; COLL_BRAKE_57 - db LAND_TILE ; 58 - db LAND_TILE ; 59 - db LAND_TILE ; 5a - db LAND_TILE ; COLL_5B - db LAND_TILE ; 5c - db LAND_TILE ; 5d - db LAND_TILE ; 5e - db LAND_TILE ; 5f - db LAND_TILE ; COLL_PIT - db LAND_TILE ; COLL_VIRTUAL_BOY - db WALL_TILE ; 62 - db LAND_TILE ; 63 - db LAND_TILE ; COLL_64 - db LAND_TILE ; COLL_65 - db LAND_TILE ; 66 - db LAND_TILE ; 67 - db LAND_TILE ; COLL_PIT_68 - db LAND_TILE ; 69 - db WALL_TILE ; 6a - db LAND_TILE ; 6b - db LAND_TILE ; 6c - db LAND_TILE ; 6d - db LAND_TILE ; 6e - db LAND_TILE ; 6f - db LAND_TILE ; COLL_WARP_CARPET_DOWN - db LAND_TILE ; COLL_DOOR - db LAND_TILE ; COLL_LADDER - db LAND_TILE ; COLL_STAIRCASE_73 - db LAND_TILE ; COLL_CAVE_74 - db LAND_TILE ; COLL_DOOR_75 - db LAND_TILE ; COLL_WARP_CARPET_LEFT - db LAND_TILE ; COLL_WARP_77 - db LAND_TILE ; COLL_WARP_CARPET_UP - db LAND_TILE ; COLL_DOOR_79 - db LAND_TILE ; COLL_STAIRCASE - db LAND_TILE ; COLL_CAVE - db LAND_TILE ; COLL_WARP_PANEL - db LAND_TILE ; COLL_DOOR_7D - db LAND_TILE ; COLL_WARP_CARPET_RIGHT - db LAND_TILE ; COLL_WARP_7F - db WALL_TILE ; 80 - db WALL_TILE ; 81 - db WALL_TILE ; 82 - db WALL_TILE ; 83 - db WALL_TILE ; 84 - db LAND_TILE ; 85 - db LAND_TILE ; 86 - db LAND_TILE ; 87 - db WALL_TILE ; 88 - db WALL_TILE ; 89 - db WALL_TILE ; 8a - db WALL_TILE ; 8b - db WALL_TILE ; 8c - db LAND_TILE ; 8d - db LAND_TILE ; 8e - db LAND_TILE ; 8f - db WALL_TILE ; COLL_COUNTER - db WALL_TILE ; COLL_BOOKSHELF - db WALL_TILE ; 92 - db WALL_TILE ; COLL_PC - db WALL_TILE ; COLL_RADIO - db WALL_TILE ; COLL_TOWN_MAP - db WALL_TILE ; COLL_MART_SHELF - db WALL_TILE ; COLL_TV - db WALL_TILE ; COLL_COUNTER_98 - db WALL_TILE ; 99 - db WALL_TILE ; 9a - db WALL_TILE ; 9b - db WALL_TILE ; COLL_9C - db WALL_TILE ; COLL_WINDOW - db WALL_TILE ; 9e - db WALL_TILE ; COLL_INCENSE_BURNER - db LAND_TILE ; COLL_HOP_RIGHT - db LAND_TILE ; COLL_HOP_LEFT - db LAND_TILE ; COLL_HOP_UP - db LAND_TILE ; COLL_HOP_DOWN - db LAND_TILE ; COLL_HOP_DOWN_RIGHT - db LAND_TILE ; COLL_HOP_DOWN_LEFT - db LAND_TILE ; COLL_HOP_UP_RIGHT - db LAND_TILE ; COLL_HOP_UP_LEFT - db LAND_TILE ; a8 - db LAND_TILE ; a9 - db LAND_TILE ; aa - db LAND_TILE ; ab - db LAND_TILE ; ac - db LAND_TILE ; ad - db LAND_TILE ; ae - db LAND_TILE ; af - db LAND_TILE ; COLL_RIGHT_WALL - db LAND_TILE ; COLL_LEFT_WALL - db LAND_TILE ; COLL_UP_WALL - db LAND_TILE ; COLL_DOWN_WALL - db LAND_TILE ; COLL_DOWN_RIGHT_WALL - db LAND_TILE ; COLL_DOWN_LEFT_WALL - db LAND_TILE ; COLL_UP_RIGHT_WALL - db LAND_TILE ; COLL_UP_LEFT_WALL - db LAND_TILE ; b8 - db LAND_TILE ; b9 - db LAND_TILE ; ba - db LAND_TILE ; bb - db LAND_TILE ; bc - db LAND_TILE ; bd - db LAND_TILE ; be - db LAND_TILE ; bf - db WATER_TILE ; COLL_RIGHT_BUOY - db WATER_TILE ; COLL_LEFT_BUOY - db WATER_TILE ; COLL_UP_BUOY - db WATER_TILE ; COLL_DOWN_BUOY - db WATER_TILE ; COLL_DOWN_RIGHT_BUOY - db WATER_TILE ; COLL_DOWN_LEFT_BUOY - db WATER_TILE ; COLL_UP_RIGHT_BUOY - db WATER_TILE ; COLL_UP_LEFT_BUOY - db WATER_TILE ; c8 - db WATER_TILE ; c9 - db WATER_TILE ; ca - db WATER_TILE ; cb - db WATER_TILE ; cc - db WATER_TILE ; cd - db WATER_TILE ; ce - db WATER_TILE ; cf - db LAND_TILE ; d0 - db LAND_TILE ; d1 - db LAND_TILE ; d2 - db LAND_TILE ; d3 - db LAND_TILE ; d4 - db LAND_TILE ; d5 - db LAND_TILE ; d6 - db LAND_TILE ; d7 - db LAND_TILE ; d8 - db LAND_TILE ; d9 - db LAND_TILE ; da - db LAND_TILE ; db - db LAND_TILE ; dc - db LAND_TILE ; dd - db LAND_TILE ; de - db LAND_TILE ; df - db LAND_TILE ; e0 - db LAND_TILE ; e1 - db LAND_TILE ; e2 - db LAND_TILE ; e3 - db LAND_TILE ; e4 - db LAND_TILE ; e5 - db LAND_TILE ; e6 - db LAND_TILE ; e7 - db LAND_TILE ; e8 - db LAND_TILE ; e9 - db LAND_TILE ; ea - db LAND_TILE ; eb - db LAND_TILE ; ec - db LAND_TILE ; ed - db LAND_TILE ; ee - db LAND_TILE ; ef - db LAND_TILE ; f0 - db LAND_TILE ; f1 - db LAND_TILE ; f2 - db LAND_TILE ; f3 - db LAND_TILE ; f4 - db LAND_TILE ; f5 - db LAND_TILE ; f6 - db LAND_TILE ; f7 - db LAND_TILE ; f8 - db LAND_TILE ; f9 - db LAND_TILE ; fa - db LAND_TILE ; fb - db LAND_TILE ; fc - db LAND_TILE ; fd - db LAND_TILE ; fe - db WALL_TILE ; COLL_FF diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm deleted file mode 100644 index 5c94c62f9..000000000 --- a/data/events/collision_stdscripts.asm +++ /dev/null @@ -1,18 +0,0 @@ -; std scripts associated with tile collisions - -stdcoll: MACRO - db \1 - dw (\2StdScript - StdScripts) / 3 -ENDM - -TileCollisionStdScripts: - ; collision type, std script - stdcoll COLL_BOOKSHELF, MagazineBookshelfScript - stdcoll COLL_PC, PCScript - stdcoll COLL_RADIO, Radio1Script - stdcoll COLL_TOWN_MAP, TownMapScript - stdcoll COLL_MART_SHELF, MerchandiseShelfScript - stdcoll COLL_TV, TVScript - stdcoll COLL_WINDOW, WindowScript - stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript - db -1 ; end diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm deleted file mode 100644 index fea80f537..000000000 --- a/data/events/field_move_blocks.asm +++ /dev/null @@ -1,52 +0,0 @@ -CutTreeBlockPointers: -; tileset, block list pointer - dbw TILESET_JOHTO, .johto - dbw TILESET_JOHTO_MODERN, .johto_modern - dbw TILESET_KANTO, .kanto - dbw TILESET_PARK, .park - dbw TILESET_FOREST, .forest - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $03, $02, 1 ; grass - db $5b, $3c, 0 ; tree - db $5f, $3d, 0 ; tree - db $63, $3f, 0 ; tree - db $67, $3e, 0 ; tree - db -1 ; end - -.johto_modern: -; facing block, replacement block, animation - db $03, $02, $01 ; grass - db -1 ; end - -.kanto: -; facing block, replacement block, animation - db $0b, $0a, 1 ; grass - db $32, $6d, 0 ; tree - db $33, $6c, 0 ; tree - db $34, $6f, 0 ; tree - db $35, $4c, 0 ; tree - db $60, $6e, 0 ; tree - db -1 ; end - -.park: -; facing block, replacement block, animation - db $13, $03, 1 ; grass - db $03, $04, 1 ; grass - db -1 ; end - -.forest: -; facing block, replacement block, animation - db $0f, $17, 0 - db -1 ; end - -WhirlpoolBlockPointers: - dbw TILESET_JOHTO, .johto - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $07, $36, 0 - db -1 ; end -- cgit v1.2.3 From 6d333bed5fde0c2da0a6a9df2ccae83933400e42 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Oct 2020 10:21:10 -0400 Subject: Replace many '; unused' with '; unreferenced' --- data/battle/effect_command_pointers.asm | 4 ++-- data/sprite_anims/framesets.asm | 18 +++++++++--------- data/sprite_anims/oam.asm | 4 ++-- data/text/battle.asm | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index d5c044d78..d1f747a1f 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -63,7 +63,7 @@ BattleCommandPointers: dw BattleCommand_Charge dw BattleCommand_CheckCharge dw BattleCommand_TrapTarget - dw BattleCommand3c + dw BattleCommand_Unused3C dw BattleCommand_Rampage dw BattleCommand_CheckRampage dw BattleCommand_ConstantDamage @@ -96,7 +96,7 @@ BattleCommandPointers: dw BattleCommand_Endure dw BattleCommand_CheckCurl dw BattleCommand_RolloutPower - dw BattleCommand5d + dw BattleCommand_Unused5D dw BattleCommand_FuryCutter dw BattleCommand_Attract dw BattleCommand_HappinessPower diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 1052f6aad..5a154acd8 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -245,45 +245,45 @@ SpriteAnimFrameData: frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP dorestart -; unused +.Frameset_Unknown1: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_43, 8 frame SPRITE_ANIM_OAMSET_UNUSED_44, 8 dorestart -; unused +.Frameset_Unknown2: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_45, 8 frame SPRITE_ANIM_OAMSET_UNUSED_46, 8 dorestart -; unused +.Frameset_Unknown3: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_47, 8 frame SPRITE_ANIM_OAMSET_UNUSED_48, 8 dorestart -; unused +.Frameset_Unknown4: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_49, 1 frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP, OAM_Y_FLIP frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_Y_FLIP dorestart -; unused +.Frameset_Unknown5: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32 endanim -; unused +.Frameset_Unknown6: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32 endanim -; unused +.Frameset_Unknown7: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32 endanim -; unused +.Frameset_Unknown8: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32 endanim -; unused +.Frameset_Unknown9: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3 dowait 3 dorestart diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 84fb1fdcd..10e6ed1d9 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -181,7 +181,7 @@ SpriteAnimOAMData: dbsprite -1, 0, 0, 0, $00, 7 | Y_FLIP dbsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP -; unused +.OAMData_Unknown1: ; unreferenced db 4 dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY @@ -305,7 +305,7 @@ SpriteAnimOAMData: dbsprite 1, 0, 4, 4, $17, 0 dbsprite 1, 1, 4, 4, $18, 0 -; unused +.OAMData_Unknown2: ; unreferenced db 36 dbsprite -3, -3, 0, 0, $00, 0 dbsprite -2, -3, 0, 0, $01, 0 diff --git a/data/text/battle.asm b/data/text/battle.asm index 072ab50d9..a9836df4f 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -349,7 +349,7 @@ BattleText_StringBuffer1GrewToLevel: sound_dex_fanfare_50_79 text_end - text_end ; unused + text_end ; unreferenced BattleText_WildMonIsEating: text "Wild @" -- cgit v1.2.3 From ea426a88794b1d216a278b54d18cefafbf7d8771 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Oct 2020 13:35:39 -0400 Subject: Identify more WRAM labels, and start a _DummyFunction label convention --- data/events/engine_flags.asm | 2 +- data/events/special_pointers.asm | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm index f43e64aea..526413651 100644 --- a/data/events/engine_flags.asm +++ b/data/events/engine_flags.asm @@ -125,7 +125,7 @@ EngineFlags: engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F - engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F + engine_flag wGameTimerPaused, GAME_TIMER_MOBILE_F engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index e1702991c..5d6b0a16e 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -55,8 +55,8 @@ SpecialsPointers:: add_special UnownPuzzle add_special SlotMachine add_special CardFlip - add_special DummyNonfunctionalGameCornerGame - add_special ClearBGPalettesBufferScreen + add_special UnusedDummyGame ; unused + add_special ClearBGPalettesBufferScreen ; unused add_special FadeOutPalettes add_special BattleTowerFade add_special FadeBlackQuickly @@ -65,21 +65,21 @@ SpecialsPointers:: add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 - add_special ClearTilemap ; bank 0 + add_special ClearTilemap ; bank 0; unused as special add_special UpdateSprites ; bank 0 add_special UpdatePlayerSprite ; bank 0 add_special GameCornerPrizeMonCheckDex - add_special UnusedSetSeenMon + add_special UnusedSetSeenMon ; unused add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 add_special HealMachineAnim add_special SurfStartStep - add_special FindPartyMonAboveLevel - add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonAboveLevel ; unused + add_special FindPartyMonAtLeastThatHappy ; unused add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID - add_special UnusedCheckUnusedTwoDayTimer + add_special UnusedCheckUnusedTwoDayTimer ; unused add_special DayCareMon1 add_special DayCareMon2 add_special SelectRandomBugContestContestants @@ -134,7 +134,7 @@ SpecialsPointers:: add_special Function170114 add_special BattleTowerBattle add_special Function1704e1 - add_special DummySpecial_17021d + add_special UnusedBattleTowerDummySpecial1 add_special LoadOpponentTrainerAndPokemonWithOTSprite add_special Function11ba38 add_special CheckForBattleTowerRules @@ -166,7 +166,7 @@ SpecialsPointers:: add_special BeastsCheck add_special MonCheck add_special SetPlayerPalette - add_special DummySpecial_170bd2 + add_special UnusedBattleTowerDummySpecial2 add_special Mobile_SelectThreeMons add_special Function1037eb add_special Function10383c @@ -181,4 +181,4 @@ SpecialsPointers:: add_special UnusedFindItemInPCOrBag add_special InitialSetDSTFlag add_special InitialClearDSTFlag - add_special DummySpecial_c224 + add_special UnusedDummySpecial ; unused -- cgit v1.2.3 From bcc0d633e948227e68da8a264d1533771a54b5c4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 29 Oct 2020 14:45:40 -0400 Subject: Identify the remaining (non-mobile) uses of another WRAM union --- data/text/common_3.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/text/common_3.asm b/data/text/common_3.asm index cc5a53c2e..e081f0d32 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -72,7 +72,7 @@ _LinkAbnormalMonText:: _LinkAskTradeForText:: text "Trade @" - text_ram wd004 + text_ram wBufferTrademonNick text_start line "for @" text_ram wStringBuffer1 -- cgit v1.2.3 From ba5bc304f959d2387b45b9320808797272cf958a Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 29 Oct 2020 23:23:57 -0400 Subject: Updates to more closely sync with pokegold --- data/events/special_pointers.asm | 1 + data/player_names.asm | 8 ++++---- data/text/battle.asm | 2 +- data/text/common_1.asm | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index 5d6b0a16e..e2814b879 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -179,6 +179,7 @@ SpecialsPointers:: add_special AskRememberPassword add_special LoadMapPalettes add_special UnusedFindItemInPCOrBag + add_special InitialSetDSTFlag add_special InitialClearDSTFlag add_special UnusedDummySpecial ; unused diff --git a/data/player_names.asm b/data/player_names.asm index 6263cb828..d537af5dc 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -2,8 +2,8 @@ ChrisNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames - db 1 ; ???? - db 0 ; default option + db 1 ; default option + db 0 ; ???? .MaleNames: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags @@ -21,8 +21,8 @@ KrisNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames - db 1 ; ???? - db 0 ; default option + db 1 ; default option + db 0 ; ???? .FemaleNames: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags diff --git a/data/text/battle.asm b/data/text/battle.asm index a9836df4f..fc2e3a1cf 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1085,7 +1085,7 @@ BeatUpAttackText: line "attack!" done -RefusedGiftText: +PresentFailedText: text "" line "refused the gift!" prompt diff --git a/data/text/common_1.asm b/data/text/common_1.asm index a07617e2c..46cf48b40 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1664,7 +1664,7 @@ _DayCareManIntroText:: cont "raise a #MON?" done -_DayCareManOddEggText:: +_DayCareManIntroEggText:: text "I'm the DAY-CARE" line "MAN. Do you know" cont "about EGGS?" @@ -1691,7 +1691,7 @@ _DayCareLadyIntroText:: line "#MON for you?" done -_DayCareLadyOddEggText:: +_DayCareLadyIntroEggText:: text "I'm the DAY-CARE" line "LADY. Do you know" cont "about EGGS?" -- cgit v1.2.3 From 1237156948ba0fa3d98b6b35f4a2ec9cb797ed05 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 30 Oct 2020 10:45:31 -0400 Subject: Identify mobile Name Card exchange labels --- data/text/common_2.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 71b610454..09cd24e4d 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -260,14 +260,14 @@ _MysteryGiftSentHomeText:: text "'s home." prompt -_MysteryGiftReceivedCardText:: +_NameCardReceivedCardText:: text "Received" line "@" text_ram wMysteryGiftCardHolderName text "'s CARD." prompt -_MysteryGiftListedCardText:: +_NameCardListedCardText:: text_ram wMysteryGiftCardHolderName text "'s CARD was" line "listed as no.@" @@ -275,17 +275,17 @@ _MysteryGiftListedCardText:: text "." prompt -_MysteryGiftNotRegisteredCardText:: +_NameCardNotRegisteredCardText:: text "The CARD was not" line "registered." prompt -_MysteryGiftLinkCancelledText:: +_NameCardLinkCancelledText:: text "The link has been" line "cancelled." prompt -_MysteryGiftLinkCommErrorText:: +_NameCardLinkCommErrorText:: text "Communication" line "error." prompt -- cgit v1.2.3