diff options
| -rwxr-xr-x | constants/evolution_line_constants.asm | 160 | ||||
| -rwxr-xr-x | constants/map_constants.asm | 36 | ||||
| -rwxr-xr-x | constants/pokemon_constants.asm | 302 | ||||
| -rwxr-xr-x | data/blue_wild_mons.asm | 770 | ||||
| -rwxr-xr-x | data/catchem_timer_values.asm | 302 | ||||
| -rwxr-xr-x | data/diglett_stage/diglett_stage_animation_data.asm | 3600 | ||||
| -rwxr-xr-x | data/evolution_lines.asm | 158 | ||||
| -rwxr-xr-x | data/mon_names.asm | 302 | ||||
| -rwxr-xr-x | data/red_wild_mons.asm | 770 | ||||
| -rwxr-xr-x | hram.asm | 10 | ||||
| -rwxr-xr-x | macros.asm | 31 | ||||
| -rwxr-xr-x | main.asm | 2280 | ||||
| -rwxr-xr-x | wram.asm | 439 |
13 files changed, 4246 insertions, 4914 deletions
diff --git a/constants/evolution_line_constants.asm b/constants/evolution_line_constants.asm index dea3519..871da64 100755 --- a/constants/evolution_line_constants.asm +++ b/constants/evolution_line_constants.asm @@ -1,81 +1,81 @@ const_value = 0 - - const EVOLINE_BULBASAUR ; $0 - const EVOLINE_CHARMANDER ; $1 - const EVOLINE_SQUIRTLE ; $2 - const EVOLINE_CATERPIE ; $3 - const EVOLINE_WEEDLE ; $4 - const EVOLINE_PIDGEY ; $5 - const EVOLINE_RATTATA ; $6 - const EVOLINE_SPEAROW ; $7 - const EVOLINE_EKANS ; $8 - const EVOLINE_PIKACHU ; $9 - const EVOLINE_SANDSHREW ; $a - const EVOLINE_NIDORAN_F ; $b - const EVOLINE_NIDORAN_M ; $c - const EVOLINE_CLEFAIRY ; $d - const EVOLINE_VULPIX ; $e - const EVOLINE_JIGGLYPUFF ; $f - const EVOLINE_ZUBAT ; $10 - const EVOLINE_ODDISH ; $11 - const EVOLINE_PARAS ; $12 - const EVOLINE_VENONAT ; $13 - const EVOLINE_DIGLETT ; $14 - const EVOLINE_MEOWTH ; $15 - const EVOLINE_PSYDUCK ; $16 - const EVOLINE_MANKEY ; $17 - const EVOLINE_GROWLITHE ; $18 - const EVOLINE_POLIWAG ; $19 - const EVOLINE_ABRA ; $1a - const EVOLINE_MACHOP ; $1b - const EVOLINE_BELLSPROUT ; $1c - const EVOLINE_TENTACOOL ; $1d - const EVOLINE_GEODUDE ; $1e - const EVOLINE_PONYTA ; $1f - const EVOLINE_SLOWPOKE ; $20 - const EVOLINE_MAGNEMITE ; $21 - const EVOLINE_FARFETCH_D ; $22 - const EVOLINE_DODUO ; $23 - const EVOLINE_SEEL ; $24 - const EVOLINE_GRIMER ; $25 - const EVOLINE_SHELLDER ; $26 - const EVOLINE_GASTLY ; $27 - const EVOLINE_ONIX ; $28 - const EVOLINE_DROWZEE ; $29 - const EVOLINE_KRABBY ; $2a - const EVOLINE_VOLTORB ; $2b - const EVOLINE_EXEGGCUTE ; $2c - const EVOLINE_CUBONE ; $2d - const EVOLINE_HITMONLEE ; $2e - const EVOLINE_HITMONCHAN ; $2f - const EVOLINE_LICKITUNG ; $30 - const EVOLINE_KOFFING ; $31 - const EVOLINE_RHYHORN ; $32 - const EVOLINE_CHANSEY ; $33 - const EVOLINE_TANGELA ; $34 - const EVOLINE_KANGASKHAN ; $35 - const EVOLINE_HORSEA ; $36 - const EVOLINE_GOLDEEN ; $37 - const EVOLINE_STARYU ; $38 - const EVOLINE_MR_MIME ; $39 - const EVOLINE_SCYTHER ; $3a - const EVOLINE_JYNX ; $3b - const EVOLINE_ELECTABUZZ ; $3c - const EVOLINE_MAGMAR ; $3d - const EVOLINE_PINSIR ; $3e - const EVOLINE_TAUROS ; $3f - const EVOLINE_MAGIKARP ; $40 - const EVOLINE_LAPRAS ; $41 - const EVOLINE_DITTO ; $42 - const EVOLINE_EEVEE ; $43 - const EVOLINE_PORYGON ; $44 - const EVOLINE_OMANYTE ; $45 - const EVOLINE_KABUTO ; $46 - const EVOLINE_AERODACTYL ; $47 - const EVOLINE_SNORLAX ; $48 - const EVOLINE_ARTICUNO ; $49 - const EVOLINE_ZAPDOS ; $4a - const EVOLINE_MOLTRES ; $4b - const EVOLINE_DRATINI ; $4c - const EVOLINE_MEWTWO ; $4d - const EVOLINE_MEW ; $4e + + const EVOLINE_BULBASAUR ; $0 + const EVOLINE_CHARMANDER ; $1 + const EVOLINE_SQUIRTLE ; $2 + const EVOLINE_CATERPIE ; $3 + const EVOLINE_WEEDLE ; $4 + const EVOLINE_PIDGEY ; $5 + const EVOLINE_RATTATA ; $6 + const EVOLINE_SPEAROW ; $7 + const EVOLINE_EKANS ; $8 + const EVOLINE_PIKACHU ; $9 + const EVOLINE_SANDSHREW ; $a + const EVOLINE_NIDORAN_F ; $b + const EVOLINE_NIDORAN_M ; $c + const EVOLINE_CLEFAIRY ; $d + const EVOLINE_VULPIX ; $e + const EVOLINE_JIGGLYPUFF ; $f + const EVOLINE_ZUBAT ; $10 + const EVOLINE_ODDISH ; $11 + const EVOLINE_PARAS ; $12 + const EVOLINE_VENONAT ; $13 + const EVOLINE_DIGLETT ; $14 + const EVOLINE_MEOWTH ; $15 + const EVOLINE_PSYDUCK ; $16 + const EVOLINE_MANKEY ; $17 + const EVOLINE_GROWLITHE ; $18 + const EVOLINE_POLIWAG ; $19 + const EVOLINE_ABRA ; $1a + const EVOLINE_MACHOP ; $1b + const EVOLINE_BELLSPROUT ; $1c + const EVOLINE_TENTACOOL ; $1d + const EVOLINE_GEODUDE ; $1e + const EVOLINE_PONYTA ; $1f + const EVOLINE_SLOWPOKE ; $20 + const EVOLINE_MAGNEMITE ; $21 + const EVOLINE_FARFETCH_D ; $22 + const EVOLINE_DODUO ; $23 + const EVOLINE_SEEL ; $24 + const EVOLINE_GRIMER ; $25 + const EVOLINE_SHELLDER ; $26 + const EVOLINE_GASTLY ; $27 + const EVOLINE_ONIX ; $28 + const EVOLINE_DROWZEE ; $29 + const EVOLINE_KRABBY ; $2a + const EVOLINE_VOLTORB ; $2b + const EVOLINE_EXEGGCUTE ; $2c + const EVOLINE_CUBONE ; $2d + const EVOLINE_HITMONLEE ; $2e + const EVOLINE_HITMONCHAN ; $2f + const EVOLINE_LICKITUNG ; $30 + const EVOLINE_KOFFING ; $31 + const EVOLINE_RHYHORN ; $32 + const EVOLINE_CHANSEY ; $33 + const EVOLINE_TANGELA ; $34 + const EVOLINE_KANGASKHAN ; $35 + const EVOLINE_HORSEA ; $36 + const EVOLINE_GOLDEEN ; $37 + const EVOLINE_STARYU ; $38 + const EVOLINE_MR_MIME ; $39 + const EVOLINE_SCYTHER ; $3a + const EVOLINE_JYNX ; $3b + const EVOLINE_ELECTABUZZ ; $3c + const EVOLINE_MAGMAR ; $3d + const EVOLINE_PINSIR ; $3e + const EVOLINE_TAUROS ; $3f + const EVOLINE_MAGIKARP ; $40 + const EVOLINE_LAPRAS ; $41 + const EVOLINE_DITTO ; $42 + const EVOLINE_EEVEE ; $43 + const EVOLINE_PORYGON ; $44 + const EVOLINE_OMANYTE ; $45 + const EVOLINE_KABUTO ; $46 + const EVOLINE_AERODACTYL ; $47 + const EVOLINE_SNORLAX ; $48 + const EVOLINE_ARTICUNO ; $49 + const EVOLINE_ZAPDOS ; $4a + const EVOLINE_MOLTRES ; $4b + const EVOLINE_DRATINI ; $4c + const EVOLINE_MEWTWO ; $4d + const EVOLINE_MEW ; $4e diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 2572e86..1a28b53 100755 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,20 +1,20 @@ const_value = 0 - const PALLET_TOWN ; $0 - const VIRIDIAN_CITY ; $1 - const VIRIDIAN_FOREST ; $2 - const PEWTER_CITY ; $3 - const MT_MOON ; $4 - const CERULEAN_CITY ; $5 - const VERMILION_SEASIDE ; $6 - const VERMILION_STREETS ; $7 - const ROCK_MOUNTAIN ; $8 - const LAVENDER_TOWN ; $9 - const CELADON_CITY ; $a - const CYCLING_ROAD ; $b - const FUCHSIA_CITY ; $c - const SAFARI_ZONE ; $d - const SAFFRON_CITY ; $e - const SEAFOAM_ISLANDS ; $f - const CINNABAR_ISLAND ; $10 - const INDIGO_PLATEAU ; $11 + const PALLET_TOWN ; $0 + const VIRIDIAN_CITY ; $1 + const VIRIDIAN_FOREST ; $2 + const PEWTER_CITY ; $3 + const MT_MOON ; $4 + const CERULEAN_CITY ; $5 + const VERMILION_SEASIDE ; $6 + const VERMILION_STREETS ; $7 + const ROCK_MOUNTAIN ; $8 + const LAVENDER_TOWN ; $9 + const CELADON_CITY ; $a + const CYCLING_ROAD ; $b + const FUCHSIA_CITY ; $c + const SAFARI_ZONE ; $d + const SAFFRON_CITY ; $e + const SEAFOAM_ISLANDS ; $f + const CINNABAR_ISLAND ; $10 + const INDIGO_PLATEAU ; $11 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 10c58d6..fff8fdc 100755 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,155 +1,155 @@ const_value = 1 - const BULBASAUR ; $1 - const IVYSAUR ; $2 - const VENUSAUR ; $3 - const CHARMANDER ; $4 - const CHARMELEON ; $5 - const CHARIZARD ; $6 - const SQUIRTLE ; $7 - const WARTORTLE ; $8 - const BLASTOISE ; $9 - const CATERPIE ; $a - const METAPOD ; $b - const BUTTERFREE ; $c - const WEEDLE ; $d - const KAKUNA ; $e - const BEEDRILL ; $f - const PIDGEY ; $10 - const PIDGEOTTO ; $11 - const PIDGEOT ; $12 - const RATTATA ; $13 - const RATICATE ; $14 - const SPEAROW ; $15 - const FEAROW ; $16 - const EKANS ; $17 - const ARBOK ; $18 - const PIKACHU ; $19 - const RAICHU ; $1a - const SANDSHREW ; $1b - const SANDSLASH ; $1c - const NIDORAN_F ; $1d - const NIDORINA ; $1e - const NIDOQUEEN ; $1f - const NIDORAN_M ; $20 - const NIDORINO ; $21 - const NIDOKING ; $22 - const CLEFAIRY ; $23 - const CLEFABLE ; $24 - const VULPIX ; $25 - const NINETALES ; $26 - const JIGGLYPUFF ; $27 - const WIGGLYTUFF ; $28 - const ZUBAT ; $29 - const GOLBAT ; $2a - const ODDISH ; $2b - const GLOOM ; $2c - const VILEPLUME ; $2d - const PARAS ; $2e - const PARASECT ; $2f - const VENONAT ; $30 - const VENOMOTH ; $31 - const DIGLETT ; $32 - const DUGTRIO ; $33 - const MEOWTH ; $34 - const PERSIAN ; $35 - const PSYDUCK ; $36 - const GOLDUCK ; $37 - const MANKEY ; $38 - const PRIMEAPE ; $39 - const GROWLITHE ; $3a - const ARCANINE ; $3b - const POLIWAG ; $3c - const POLIWHIRL ; $3d - const POLIWRATH ; $3e - const ABRA ; $3f - const KADABRA ; $40 - const ALAKAZAM ; $41 - const MACHOP ; $42 - const MACHOKE ; $43 - const MACHAMP ; $44 - const BELLSPROUT ; $45 - const WEEPINBELL ; $46 - const VICTREEBEL ; $47 - const TENTACOOL ; $48 - const TENTACRUEL ; $49 - const GEODUDE ; $4a - const GRAVELER ; $4b - const GOLEM ; $4c - const PONYTA ; $4d - const RAPIDASH ; $4e - const SLOWPOKE ; $4f - const SLOWBRO ; $50 - const MAGNEMITE ; $51 - const MAGNETON ; $52 - const FARFETCH_D ; $53 - const DODUO ; $54 - const DODRIO ; $55 - const SEEL ; $56 - const DEWGONG ; $57 - const GRIMER ; $58 - const MUK ; $59 - const SHELLDER ; $5a - const CLOYSTER ; $5b - const GASTLY ; $5c - const HAUNTER ; $5d - const GENGAR ; $5e - const ONIX ; $5f - const DROWZEE ; $60 - const HYPNO ; $61 - const KRABBY ; $62 - const KINGLER ; $63 - const VOLTORB ; $64 - const ELECTRODE ; $65 - const EXEGGCUTE ; $66 - const EXEGGUTOR ; $67 - const CUBONE ; $68 - const MAROWAK ; $69 - const HITMONLEE ; $6a - const HITMONCHAN ; $6b - const LICKITUNG ; $6c - const KOFFING ; $6d - const WEEZING ; $6e - const RHYHORN ; $6f - const RHYDON ; $70 - const CHANSEY ; $71 - const TANGELA ; $72 - const KANGASKHAN ; $73 - const HORSEA ; $74 - const SEADRA ; $75 - const GOLDEEN ; $76 - const SEAKING ; $77 - const STARYU ; $78 - const STARMIE ; $79 - const MR_MIME ; $7a - const SCYTHER ; $7b - const JYNX ; $7c - const ELECTABUZZ ; $7d - const MAGMAR ; $7e - const PINSIR ; $7f - const TAUROS ; $80 - const MAGIKARP ; $81 - const GYARADOS ; $82 - const LAPRAS ; $83 - const DITTO ; $84 - const EEVEE ; $85 - const VAPOREON ; $86 - const JOLTEON ; $87 - const FLAREON ; $88 - const PORYGON ; $89 - const OMANYTE ; $8a - const OMASTAR ; $8b - const KABUTO ; $8c - const KABUTOPS ; $8d - const AERODACTYL ; $8e - const SNORLAX ; $8f - const ARTICUNO ; $90 - const ZAPDOS ; $91 - const MOLTRES ; $92 - const DRATINI ; $93 - const DRAGONAIR ; $94 - const DRAGONITE ; $95 - const MEWTWO ; $96 - const MEW ; $97 + const BULBASAUR ; $1 + const IVYSAUR ; $2 + const VENUSAUR ; $3 + const CHARMANDER ; $4 + const CHARMELEON ; $5 + const CHARIZARD ; $6 + const SQUIRTLE ; $7 + const WARTORTLE ; $8 + const BLASTOISE ; $9 + const CATERPIE ; $a + const METAPOD ; $b + const BUTTERFREE ; $c + const WEEDLE ; $d + const KAKUNA ; $e + const BEEDRILL ; $f + const PIDGEY ; $10 + const PIDGEOTTO ; $11 + const PIDGEOT ; $12 + const RATTATA ; $13 + const RATICATE ; $14 + const SPEAROW ; $15 + const FEAROW ; $16 + const EKANS ; $17 + const ARBOK ; $18 + const PIKACHU ; $19 + const RAICHU ; $1a + const SANDSHREW ; $1b + const SANDSLASH ; $1c + const NIDORAN_F ; $1d + const NIDORINA ; $1e + const NIDOQUEEN ; $1f + const NIDORAN_M ; $20 + const NIDORINO ; $21 + const NIDOKING ; $22 + const CLEFAIRY ; $23 + const CLEFABLE ; $24 + const VULPIX ; $25 + const NINETALES ; $26 + const JIGGLYPUFF ; $27 + const WIGGLYTUFF ; $28 + const ZUBAT ; $29 + const GOLBAT ; $2a + const ODDISH ; $2b + const GLOOM ; $2c + const VILEPLUME ; $2d + const PARAS ; $2e + const PARASECT ; $2f + const VENONAT ; $30 + const VENOMOTH ; $31 + const DIGLETT ; $32 + const DUGTRIO ; $33 + const MEOWTH ; $34 + const PERSIAN ; $35 + const PSYDUCK ; $36 + const GOLDUCK ; $37 + const MANKEY ; $38 + const PRIMEAPE ; $39 + const GROWLITHE ; $3a + const ARCANINE ; $3b + const POLIWAG ; $3c + const POLIWHIRL ; $3d + const POLIWRATH ; $3e + const ABRA ; $3f + const KADABRA ; $40 + const ALAKAZAM ; $41 + const MACHOP ; $42 + const MACHOKE ; $43 + const MACHAMP ; $44 + const BELLSPROUT ; $45 + const WEEPINBELL ; $46 + const VICTREEBEL ; $47 + const TENTACOOL ; $48 + const TENTACRUEL ; $49 + const GEODUDE ; $4a + const GRAVELER ; $4b + const GOLEM ; $4c + const PONYTA ; $4d + const RAPIDASH ; $4e + const SLOWPOKE ; $4f + const SLOWBRO ; $50 + const MAGNEMITE ; $51 + const MAGNETON ; $52 + const FARFETCH_D ; $53 + const DODUO ; $54 + const DODRIO ; $55 + const SEEL ; $56 + const DEWGONG ; $57 + const GRIMER ; $58 + const MUK ; $59 + const SHELLDER ; $5a + const CLOYSTER ; $5b + const GASTLY ; $5c + const HAUNTER ; $5d + const GENGAR ; $5e + const ONIX ; $5f + const DROWZEE ; $60 + const HYPNO ; $61 + const KRABBY ; $62 + const KINGLER ; $63 + const VOLTORB ; $64 + const ELECTRODE ; $65 + const EXEGGCUTE ; $66 + const EXEGGUTOR ; $67 + const CUBONE ; $68 + const MAROWAK ; $69 + const HITMONLEE ; $6a + const HITMONCHAN ; $6b + const LICKITUNG ; $6c + const KOFFING ; $6d + const WEEZING ; $6e + const RHYHORN ; $6f + const RHYDON ; $70 + const CHANSEY ; $71 + const TANGELA ; $72 + const KANGASKHAN ; $73 + const HORSEA ; $74 + const SEADRA ; $75 + const GOLDEEN ; $76 + const SEAKING ; $77 + const STARYU ; $78 + const STARMIE ; $79 + const MR_MIME ; $7a + const SCYTHER ; $7b + const JYNX ; $7c + const ELECTABUZZ ; $7d + const MAGMAR ; $7e + const PINSIR ; $7f + const TAUROS ; $80 + const MAGIKARP ; $81 + const GYARADOS ; $82 + const LAPRAS ; $83 + const DITTO ; $84 + const EEVEE ; $85 + const VAPOREON ; $86 + const JOLTEON ; $87 + const FLAREON ; $88 + const PORYGON ; $89 + const OMANYTE ; $8a + const OMASTAR ; $8b + const KABUTO ; $8c + const KABUTOPS ; $8d + const AERODACTYL ; $8e + const SNORLAX ; $8f + const ARTICUNO ; $90 + const ZAPDOS ; $91 + const MOLTRES ; $92 + const DRATINI ; $93 + const DRAGONAIR ; $94 + const DRAGONITE ; $95 + const MEWTWO ; $96 + const MEW ; $97 NUM_POKEMON EQU 151 diff --git a/data/blue_wild_mons.asm b/data/blue_wild_mons.asm index 2fe50fc..98581b9 100755 --- a/data/blue_wild_mons.asm +++ b/data/blue_wild_mons.asm @@ -1,434 +1,434 @@ BlueStageWildMons: ; 0x1144d BlueStageViridianCityWildMons: ; 0x1144d - db BULBASAUR - db SQUIRTLE - db SQUIRTLE - db SQUIRTLE - db SQUIRTLE - db SQUIRTLE - db SPEAROW - db NIDORAN_F - db NIDORAN_F - db NIDORAN_F - db NIDORAN_M - db NIDORAN_M - db NIDORAN_M - db POLIWAG - db TENTACOOL - db GOLDEEN + db BULBASAUR + db SQUIRTLE + db SQUIRTLE + db SQUIRTLE + db SQUIRTLE + db SQUIRTLE + db SPEAROW + db NIDORAN_F + db NIDORAN_F + db NIDORAN_F + db NIDORAN_M + db NIDORAN_M + db NIDORAN_M + db POLIWAG + db TENTACOOL + db GOLDEEN BlueStagePalleViridianCityonsRare: ; 0x1145d - db BULBASAUR - db BULBASAUR - db BULBASAUR - db SQUIRTLE - db SPEAROW - db SPEAROW - db NIDORAN_F - db NIDORAN_F - db NIDORAN_M - db NIDORAN_M - db POLIWAG - db POLIWAG - db TENTACOOL - db TENTACOOL - db GOLDEEN - db GOLDEEN + db BULBASAUR + db BULBASAUR + db BULBASAUR + db SQUIRTLE + db SPEAROW + db SPEAROW + db NIDORAN_F + db NIDORAN_F + db NIDORAN_M + db NIDORAN_M + db POLIWAG + db POLIWAG + db TENTACOOL + db TENTACOOL + db GOLDEEN + db GOLDEEN BlueStageViridianForestWildMons: ; 0x1146d - db CATERPIE - db CATERPIE - db CATERPIE - db CATERPIE - db CATERPIE - db PIDGEY - db PIDGEY - db PIDGEY - db PIDGEY - db PIDGEY - db RATTATA - db RATTATA - db RATTATA - db RATTATA - db RATTATA - db PIKACHU + db CATERPIE + db CATERPIE + db CATERPIE + db CATERPIE + db CATERPIE + db PIDGEY + db PIDGEY + db PIDGEY + db PIDGEY + db PIDGEY + db RATTATA + db RATTATA + db RATTATA + db RATTATA + db RATTATA + db PIKACHU BlueStageViridianForestWildMonsRare: ; 0x1147d - db CATERPIE - db CATERPIE - db CATERPIE - db WEEDLE - db WEEDLE - db PIDGEY - db PIDGEY - db RATTATA - db RATTATA - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU + db CATERPIE + db CATERPIE + db CATERPIE + db WEEDLE + db WEEDLE + db PIDGEY + db PIDGEY + db RATTATA + db RATTATA + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU BlueStageMtMoonWildMons: ; 0x1148d - db RATTATA - db SPEAROW - db SPEAROW - db EKANS - db EKANS - db SANDSHREW - db SANDSHREW - db ZUBAT - db ZUBAT - db PARAS - db PARAS - db PSYDUCK - db GEODUDE - db GEODUDE - db KRABBY - db GOLDEEN + db RATTATA + db SPEAROW + db SPEAROW + db EKANS + db EKANS + db SANDSHREW + db SANDSHREW + db ZUBAT + db ZUBAT + db PARAS + db PARAS + db PSYDUCK + db GEODUDE + db GEODUDE + db KRABBY + db GOLDEEN BlueStageMtMoonWildMonsRare: ; 0x1149d - db EKANS - db EKANS - db SANDSHREW - db SANDSHREW - db CLEFAIRY - db CLEFAIRY - db CLEFAIRY - db CLEFAIRY - db CLEFAIRY - db CLEFAIRY - db ZUBAT - db ZUBAT - db PARAS - db PARAS - db GEODUDE - db GEODUDE + db EKANS + db EKANS + db SANDSHREW + db SANDSHREW + db CLEFAIRY + db CLEFAIRY + db CLEFAIRY + db CLEFAIRY + db CLEFAIRY + db CLEFAIRY + db ZUBAT + db ZUBAT + db PARAS + db PARAS + db GEODUDE + db GEODUDE BlueStageCeruleanCityWildMons: ; 0x114ad - db CATERPIE - db CATERPIE - db PIDGEY - db MEOWTH - db MEOWTH - db MEOWTH - db PSYDUCK - db ABRA - db ABRA - db BELLSPROUT - db BELLSPROUT - db BELLSPROUT - db BELLSPROUT - db BELLSPROUT - db KRABBY - db GOLDEEN + db CATERPIE + db CATERPIE + db PIDGEY + db MEOWTH + db MEOWTH + db MEOWTH + db PSYDUCK + db ABRA + db ABRA + db BELLSPROUT + db BELLSPROUT + db BELLSPROUT + db BELLSPROUT + db BELLSPROUT + db KRABBY + db GOLDEEN BlueStageCeruleanCityWildMonsRare: ; 0x114bd - db WEEDLE - db NIDORAN_M - db MEOWTH - db MEOWTH - db PSYDUCK - db PSYDUCK - db ABRA - db ABRA - db ABRA - db BELLSPROUT - db KRABBY - db GOLDEEN - db GOLDEEN - db JYNX - db JYNX - db JYNX + db WEEDLE + db NIDORAN_M + db MEOWTH + db MEOWTH + db PSYDUCK + db PSYDUCK + db ABRA + db ABRA + db ABRA + db BELLSPROUT + db KRABBY + db GOLDEEN + db GOLDEEN + db JYNX + db JYNX + db JYNX BlueStageVermilionStreetsWildMons: ; 0x114cd - db PIDGEY - db SPEAROW - db SANDSHREW - db SANDSHREW - db MEOWTH - db MEOWTH - db BELLSPROUT - db BELLSPROUT - db SHELLDER - db SHELLDER - db SHELLDER - db DROWZEE - db DROWZEE - db KRABBY - db KRABBY - db KRABBY + db PIDGEY + db SPEAROW + db SANDSHREW + db SANDSHREW + db MEOWTH + db MEOWTH + db BELLSPROUT + db BELLSPROUT + db SHELLDER + db SHELLDER + db SHELLDER + db DROWZEE + db DROWZEE + db KRABBY + db KRABBY + db KRABBY BlueStageVermilionStreetsWildMonsRare: ; 0x114dd - db SANDSHREW - db SANDSHREW - db SANDSHREW - db SANDSHREW - db MEOWTH - db BELLSPROUT - db FARFETCH_D - db FARFETCH_D - db FARFETCH_D - db FARFETCH_D - db SHELLDER - db SHELLDER - db DROWZEE - db DROWZEE - db KRABBY - db KRABBY + db SANDSHREW + db SANDSHREW + db SANDSHREW + db SANDSHREW + db MEOWTH + db BELLSPROUT + db FARFETCH_D + db FARFETCH_D + db FARFETCH_D + db FARFETCH_D + db SHELLDER + db SHELLDER + db DROWZEE + db DROWZEE + db KRABBY + db KRABBY BlueStageRockMountainWildMons: ; 0x114ed - db RATTATA - db SPEAROW - db SANDSHREW - db SANDSHREW - db ZUBAT - db DIGLETT - db DIGLETT - db DIGLETT - db DIGLETT - db MACHOP - db GEODUDE - db SLOWPOKE - db ONIX - db VOLTORB - db VOLTORB - db VOLTORB + db RATTATA + db SPEAROW + db SANDSHREW + db SANDSHREW + db ZUBAT + db DIGLETT + db DIGLETT + db DIGLETT + db DIGLETT + db MACHOP + db GEODUDE + db SLOWPOKE + db ONIX + db VOLTORB + db VOLTORB + db VOLTORB BlueStageRockMountainWildMonsRare: ; 0x114fd - db ZUBAT - db ZUBAT - db DIGLETT - db MACHOP - db MACHOP - db GEODUDE - db GEODUDE - db SLOWPOKE - db SLOWPOKE - db ONIX - db ONIX - db VOLTORB - db VOLTORB - db MR_MIME - db MR_MIME - db MR_MIME + db ZUBAT + db ZUBAT + db DIGLETT + db MACHOP + db MACHOP + db GEODUDE + db GEODUDE + db SLOWPOKE + db SLOWPOKE + db ONIX + db ONIX + db VOLTORB + db VOLTORB + db MR_MIME + db MR_MIME + db MR_MIME BlueStageCeladonCityWildMons: ; 0x1150d - db PIDGEY - db PIDGEY - db VULPIX - db VULPIX - db ODDISH - db ODDISH - db MEOWTH - db MEOWTH - db MEOWTH - db MANKEY - db MANKEY - db MANKEY - db GROWLITHE - db GROWLITHE - db BELLSPROUT - db BELLSPROUT + db PIDGEY + db PIDGEY + db VULPIX + db VULPIX + db ODDISH + db ODDISH + db MEOWTH + db MEOWTH + db MEOWTH + db MANKEY + db MANKEY + db MANKEY + db GROWLITHE + db GROWLITHE + db BELLSPROUT + db BELLSPROUT BlueStageCeladonCityWildMonsRare: ; 0x1151d - db CLEFAIRY - db CLEFAIRY - db ABRA - db ABRA - db SCYTHER - db PINSIR - db EEVEE - db EEVEE - db EEVEE - db PORYGON - db PORYGON - db PORYGON - db PORYGON - db DRATINI - db DRATINI - db DRATINI + db CLEFAIRY + db CLEFAIRY + db ABRA + db ABRA + db SCYTHER + db PINSIR + db EEVEE + db EEVEE + db EEVEE + db PORYGON + db PORYGON + db PORYGON + db PORYGON + db DRATINI + db DRATINI + db DRATINI BlueStageFuchsiaCityWildMons: ; 0x1152d - db VENONAT - db VENONAT - db KRABBY - db KRABBY - db KRABBY - db EXEGGCUTE - db EXEGGCUTE - db KANGASKHAN - db KANGASKHAN - db GOLDEEN - db GOLDEEN - db GOLDEEN - db MAGIKARP - db MAGIKARP - db MAGIKARP - db MAGIKARP + db VENONAT + db VENONAT + db KRABBY + db KRABBY + db KRABBY + db EXEGGCUTE + db EXEGGCUTE + db KANGASKHAN + db KANGASKHAN + db GOLDEEN + db GOLDEEN + db GOLDEEN + db MAGIKARP + db MAGIKARP + db MAGIKARP + db MAGIKARP BlueStageFuchsiaCityWildMonsRare: ; 0x1153d - db VENONAT - db VENONAT - db VENONAT - db VENONAT - db KRABBY - db EXEGGCUTE - db EXEGGCUTE - db EXEGGCUTE - db EXEGGCUTE - db KANGASKHAN - db KANGASKHAN - db KANGASKHAN - db KANGASKHAN - db GOLDEEN - db MAGIKARP - db MAGIKARP + db VENONAT + db VENONAT + db VENONAT + db VENONAT + db KRABBY + db EXEGGCUTE + db EXEGGCUTE + db EXEGGCUTE + db EXEGGCUTE + db KANGASKHAN + db KANGASKHAN + db KANGASKHAN + db KANGASKHAN + db GOLDEEN + db MAGIKARP + db MAGIKARP BlueStageSafariZoneWildMons: ; 0x1154d - db NIDORAN_F - db NIDORAN_F - db NIDORAN_F - db NIDORAN_F - db PARAS - db PARAS - db PARAS - db PARAS - db DODUO - db DODUO - db DODUO - db DODUO - db RHYHORN - db RHYHORN - db RHYHORN - db RHYHORN + db NIDORAN_F + db NIDORAN_F + db NIDORAN_F + db NIDORAN_F + db PARAS + db PARAS + db PARAS + db PARAS + db DODUO + db DODUO + db DODUO + db DODUO + db RHYHORN + db RHYHORN + db RHYHORN + db RHYHORN BlueStageSafariZoneWildMonsRare: ; 0x1155d - db NIDORAN_F - db NIDORAN_F - db PARAS - db PARAS - db RHYHORN - db RHYHORN - db CHANSEY - db CHANSEY - db CHANSEY - db CHANSEY - db PINSIR - db PINSIR - db TAUROS - db TAUROS - db DRATINI - db DRATINI + db NIDORAN_F + db NIDORAN_F + db PARAS + db PARAS + db RHYHORN + db RHYHORN + db CHANSEY + db CHANSEY + db CHANSEY + db CHANSEY + db PINSIR + db PINSIR + db TAUROS + db TAUROS + db DRATINI + db DRATINI BlueStageSaffronCityWildMons: ; 0x1156d - db PIDGEY - db PIDGEY - db EKANS - db EKANS - db EKANS - db SANDSHREW - db SANDSHREW - db SANDSHREW - db VULPIX - db ODDISH - db ODDISH - db MEOWTH - db MANKEY - db GROWLITHE - db BELLSPROUT - db BELLSPROUT + db PIDGEY + db PIDGEY + db EKANS + db EKANS + db EKANS + db SANDSHREW + db SANDSHREW + db SANDSHREW + db VULPIX + db ODDISH + db ODDISH + db MEOWTH + db MANKEY + db GROWLITHE + db BELLSPROUT + db BELLSPROUT BlueStageSaffronCityWildMonsRare: ; 0x1157d - db PIDGEY - db EKANS - db SANDSHREW - db VULPIX - db MEOWTH - db MANKEY - db GROWLITHE - db HITMONLEE - db HITMONLEE - db HITMONLEE - db HITMONCHAN - db HITMONCHAN - db HITMONCHAN - db LAPRAS - db LAPRAS - db LAPRAS + db PIDGEY + db EKANS + db SANDSHREW + db VULPIX + db MEOWTH + db MANKEY + db GROWLITHE + db HITMONLEE + db HITMONLEE + db HITMONLEE + db HITMONCHAN + db HITMONCHAN + db HITMONCHAN + db LAPRAS + db LAPRAS + db LAPRAS BlueStageCinnabarIslandWildMons: ; 0x1158d - db VULPIX - db VULPIX - db VULPIX - db PONYTA - db PONYTA - db PONYTA - db PONYTA - db PONYTA - db GRIMER - db GRIMER - db KOFFING - db KOFFING - db KOFFING - db KOFFING - db TANGELA - db TANGELA + db VULPIX + db VULPIX + db VULPIX + db PONYTA + db PONYTA + db PONYTA + db PONYTA + db PONYTA + db GRIMER + db GRIMER + db KOFFING + db KOFFING + db KOFFING + db KOFFING + db TANGELA + db TANGELA BlueStageCinnabarIslandWildMonsRare: ; 0x1159d - db VULPIX - db PONYTA - db PONYTA - db GRIMER - db GRIMER - db KOFFING - db KOFFING - db TANGELA - db TANGELA - db TANGELA - db MAGMAR - db MAGMAR - db MAGMAR - db AERODACTYL - db AERODACTYL - db AERODACTYL + db VULPIX + db PONYTA + db PONYTA + db GRIMER + db GRIMER + db KOFFING + db KOFFING + db TANGELA + db TANGELA + db TANGELA + db MAGMAR + db MAGMAR + db MAGMAR + db AERODACTYL + db AERODACTYL + db AERODACTYL BlueStageIndigoPlateauWildMons: ; 0x115ad - db SPEAROW - db SANDSHREW - db ZUBAT - db ZUBAT - db MACHOP - db MACHOP - db MACHOP - db GEODUDE - db GEODUDE - db GEODUDE - db ONIX - db ONIX - db ONIX - db DITTO - db DITTO - db DITTO + db SPEAROW + db SANDSHREW + db ZUBAT + db ZUBAT + db MACHOP + db MACHOP + db MACHOP + db GEODUDE + db GEODUDE + db GEODUDE + db ONIX + db ONIX + db ONIX + db DITTO + db DITTO + db DITTO BlueStageIndigoPlateauWildMonsRare: ; 0x115bd - db SPEAROW - db SANDSHREW - db ZUBAT - db MACHOP - db GEODUDE - db ONIX - db DITTO - db DITTO - db DITTO - db DITTO - db MOLTRES - db MOLTRES - db MOLTRES - db MEWTWO - db MEWTWO - db MEWTWO + db SPEAROW + db SANDSHREW + db ZUBAT + db MACHOP + db GEODUDE + db ONIX + db DITTO + db DITTO + db DITTO + db DITTO + db MOLTRES + db MOLTRES + db MOLTRES + db MEWTWO + db MEWTWO + db MEWTWO - db MEW + db MEW diff --git a/data/catchem_timer_values.asm b/data/catchem_timer_values.asm index 15bf275..5e7c776 100755 --- a/data/catchem_timer_values.asm +++ b/data/catchem_timer_values.asm @@ -4,154 +4,154 @@ CatchEmTimerData: ; 0x12a22 ; different pokemon have different times, in order to add difficulty. ; First byte = seconds value ; Second byte = minutes value - db $00, $02 ; BULBASAUR - db $00, $02 ; IVYSAUR - db $00, $02 ; VENUSAUR - db $00, $02 ; CHARMANDER - db $00, $02 ; CHARMELEON - db $00, $02 ; CHARIZARD - db $00, $02 ; SQUIRTLE - db $00, $02 ; WARTORTLE - db $00, $02 ; BLASTOISE - db $00, $02 ; CATERPIE - db $00, $02 ; METAPOD - db $00, $02 ; BUTTERFREE - db $00, $02 ; WEEDLE - db $00, $02 ; KAKUNA - db $00, $02 ; BEEDRILL - db $00, $02 ; PIDGEY - db $00, $02 ; PIDGEOTTO - db $00, $02 ; PIDGEOT - db $00, $02 ; RATTATA - db $00, $02 ; RATICATE - db $00, $02 ; SPEAROW - db $00, $02 ; FEAROW - db $00, $02 ; EKANS - db $00, $02 ; ARBOK - db $00, $02 ; PIKACHU - db $00, $02 ; RAICHU - db $00, $02 ; SANDSHREW - db $00, $02 ; SANDSLASH - db $00, $02 ; NIDORAN_F - db $00, $02 ; NIDORINA - db $00, $02 ; NIDOQUEEN - db $00, $02 ; NIDORAN_M - db $00, $02 ; NIDORINO - db $00, $02 ; NIDOKING - db $00, $02 ; CLEFAIRY - db $00, $02 ; CLEFABLE - db $00, $02 ; VULPIX - db $00, $02 ; NINETALES - db $00, $02 ; JIGGLYPUFF - db $00, $02 ; WIGGLYTUFF - db $00, $02 ; ZUBAT - db $00, $02 ; GOLBAT - db $00, $02 ; ODDISH - db $00, $02 ; GLOOM - db $00, $02 ; VILEPLUME - db $00, $02 ; PARAS - db $00, $02 ; PARASECT - db $00, $02 ; VENONAT - db $00, $02 ; VENOMOTH - db $00, $02 ; DIGLETT - db $00, $02 ; DUGTRIO - db $00, $02 ; MEOWTH - db $00, $02 ; PERSIAN - db $00, $02 ; PSYDUCK - db $00, $02 ; GOLDUCK - db $00, $02 ; MANKEY - db $00, $02 ; PRIMEAPE - db $00, $02 ; GROWLITHE - db $00, $02 ; ARCANINE - db $00, $02 ; POLIWAG - db $00, $02 ; POLIWHIRL - db $00, $02 ; POLIWRATH - db $00, $02 ; ABRA - db $00, $02 ; KADABRA - db $00, $02 ; ALAKAZAM - db $00, $02 ; MACHOP - db $00, $02 ; MACHOKE - db $00, $02 ; MACHAMP - db $00, $02 ; BELLSPROUT - db $00, $02 ; WEEPINBELL - db $00, $02 ; VICTREEBEL - db $00, $02 ; TENTACOOL - db $00, $02 ; TENTACRUEL - db $00, $02 ; GEODUDE - db $00, $02 ; GRAVELER - db $00, $02 ; GOLEM - db $00, $02 ; PONYTA - db $00, $02 ; RAPIDASH - db $00, $02 ; SLOWPOKE - db $00, $02 ; SLOWBRO - db $00, $02 ; MAGNEMITE - db $00, $02 ; MAGNETON - db $00, $02 ; FARFETCH_D - db $00, $02 ; DODUO - db $00, $02 ; DODRIO - db $00, $02 ; SEEL - db $00, $02 ; DEWGONG - db $00, $02 ; GRIMER - db $00, $02 ; MUK - db $00, $02 ; SHELLDER - db $00, $02 ; CLOYSTER - db $00, $02 ; GASTLY - db $00, $02 ; HAUNTER - db $00, $02 ; GENGAR - db $00, $02 ; ONIX - db $00, $02 ; DROWZEE - db $00, $02 ; HYPNO - db $00, $02 ; KRABBY - db $00, $02 ; KINGLER - db $00, $02 ; VOLTORB - db $00, $02 ; ELECTRODE - db $00, $02 ; EXEGGCUTE - db $00, $02 ; EXEGGUTOR - db $00, $02 ; CUBONE - db $00, $02 ; MAROWAK - db $00, $02 ; HITMONLEE - db $00, $02 ; HITMONCHAN - db $00, $02 ; LICKITUNG - db $00, $02 ; KOFFING - db $00, $02 ; WEEZING - db $00, $02 ; RHYHORN - db $00, $02 ; RHYDON - db $00, $02 ; CHANSEY - db $00, $02 ; TANGELA - db $00, $02 ; KANGASKHAN - db $00, $02 ; HORSEA - db $00, $02 ; SEADRA - db $00, $02 ; GOLDEEN - db $00, $02 ; SEAKING - db $00, $02 ; STARYU - db $00, $02 ; STARMIE - db $00, $02 ; MR_MIME - db $00, $02 ; SCYTHER - db $00, $02 ; JYNX - db $00, $02 ; ELECTABUZZ - db $00, $02 ; MAGMAR - db $00, $02 ; PINSIR - db $00, $02 ; TAUROS - db $00, $02 ; MAGIKARP - db $00, $02 ; GYARADOS - db $00, $02 ; LAPRAS - db $00, $02 ; DITTO - db $00, $02 ; EEVEE - db $00, $02 ; VAPOREON - db $00, $02 ; JOLTEON - db $00, $02 ; FLAREON - db $00, $02 ; PORYGON - db $00, $02 ; OMANYTE - db $00, $02 ; OMASTAR - db $00, $02 ; KABUTO - db $00, $02 ; KABUTOPS - db $00, $02 ; AERODACTYL - db $00, $02 ; SNORLAX - db $00, $02 ; ARTICUNO - db $00, $02 ; ZAPDOS - db $00, $02 ; MOLTRES - db $00, $02 ; DRATINI - db $00, $02 ; DRAGONAIR - db $00, $02 ; DRAGONITE - db $00, $02 ; MEWTWO - db $00, $02 ; MEW + db $00, $02 ; BULBASAUR + db $00, $02 ; IVYSAUR + db $00, $02 ; VENUSAUR + db $00, $02 ; CHARMANDER + db $00, $02 ; CHARMELEON + db $00, $02 ; CHARIZARD + db $00, $02 ; SQUIRTLE + db $00, $02 ; WARTORTLE + db $00, $02 ; BLASTOISE + db $00, $02 ; CATERPIE + db $00, $02 ; METAPOD + db $00, $02 ; BUTTERFREE + db $00, $02 ; WEEDLE + db $00, $02 ; KAKUNA + db $00, $02 ; BEEDRILL + db $00, $02 ; PIDGEY + db $00, $02 ; PIDGEOTTO + db $00, $02 ; PIDGEOT + db $00, $02 ; RATTATA + db $00, $02 ; RATICATE + db $00, $02 ; SPEAROW + db $00, $02 ; FEAROW + db $00, $02 ; EKANS + db $00, $02 ; ARBOK + db $00, $02 ; PIKACHU + db $00, $02 ; RAICHU + db $00, $02 ; SANDSHREW + db $00, $02 ; SANDSLASH + db $00, $02 ; NIDORAN_F + db $00, $02 ; NIDORINA + db $00, $02 ; NIDOQUEEN + db $00, $02 ; NIDORAN_M + db $00, $02 ; NIDORINO + db $00, $02 ; NIDOKING + db $00, $02 ; CLEFAIRY + db $00, $02 ; CLEFABLE + db $00, $02 ; VULPIX + db $00, $02 ; NINETALES + db $00, $02 ; JIGGLYPUFF + db $00, $02 ; WIGGLYTUFF + db $00, $02 ; ZUBAT + db $00, $02 ; GOLBAT + db $00, $02 ; ODDISH + db $00, $02 ; GLOOM + db $00, $02 ; VILEPLUME + db $00, $02 ; PARAS + db $00, $02 ; PARASECT + db $00, $02 ; VENONAT + db $00, $02 ; VENOMOTH + db $00, $02 ; DIGLETT + db $00, $02 ; DUGTRIO + db $00, $02 ; MEOWTH + db $00, $02 ; PERSIAN + db $00, $02 ; PSYDUCK + db $00, $02 ; GOLDUCK + db $00, $02 ; MANKEY + db $00, $02 ; PRIMEAPE + db $00, $02 ; GROWLITHE + db $00, $02 ; ARCANINE + db $00, $02 ; POLIWAG + db $00, $02 ; POLIWHIRL + db $00, $02 ; POLIWRATH + db $00, $02 ; ABRA + db $00, $02 ; KADABRA + db $00, $02 ; ALAKAZAM + db $00, $02 ; MACHOP + db $00, $02 ; MACHOKE + db $00, $02 ; MACHAMP + db $00, $02 ; BELLSPROUT + db $00, $02 ; WEEPINBELL + db $00, $02 ; VICTREEBEL + db $00, $02 ; TENTACOOL + db $00, $02 ; TENTACRUEL + db $00, $02 ; GEODUDE + db $00, $02 ; GRAVELER + db $00, $02 ; GOLEM + db $00, $02 ; PONYTA + db $00, $02 ; RAPIDASH + db $00, $02 ; SLOWPOKE + db $00, $02 ; SLOWBRO + db $00, $02 ; MAGNEMITE + db $00, $02 ; MAGNETON + db $00, $02 ; FARFETCH_D + db $00, $02 ; DODUO + db $00, $02 ; DODRIO + db $00, $02 ; SEEL + db $00, $02 ; DEWGONG + db $00, $02 ; GRIMER + db $00, $02 ; MUK + db $00, $02 ; SHELLDER + db $00, $02 ; CLOYSTER + db $00, $02 ; GASTLY + db $00, $02 ; HAUNTER + db $00, $02 ; GENGAR + db $00, $02 ; ONIX + db $00, $02 ; DROWZEE + db $00, $02 ; HYPNO + db $00, $02 ; KRABBY + db $00, $02 ; KINGLER + db $00, $02 ; VOLTORB + db $00, $02 ; ELECTRODE + db $00, $02 ; EXEGGCUTE + db $00, $02 ; EXEGGUTOR + db $00, $02 ; CUBONE + db $00, $02 ; MAROWAK + db $00, $02 ; HITMONLEE + db $00, $02 ; HITMONCHAN + db $00, $02 ; LICKITUNG + db $00, $02 ; KOFFING + db $00, $02 ; WEEZING + db $00, $02 ; RHYHORN + db $00, $02 ; RHYDON + db $00, $02 ; CHANSEY + db $00, $02 ; TANGELA + db $00, $02 ; KANGASKHAN + db $00, $02 ; HORSEA + db $00, $02 ; SEADRA + db $00, $02 ; GOLDEEN + db $00, $02 ; SEAKING + db $00, $02 ; STARYU + db $00, $02 ; STARMIE + db $00, $02 ; MR_MIME + db $00, $02 ; SCYTHER + db $00, $02 ; JYNX + db $00, $02 ; ELECTABUZZ + db $00, $02 ; MAGMAR + db $00, $02 ; PINSIR + db $00, $02 ; TAUROS + db $00, $02 ; MAGIKARP + db $00, $02 ; GYARADOS + db $00, $02 ; LAPRAS + db $00, $02 ; DITTO + db $00, $02 ; EEVEE + db $00, $02 ; VAPOREON + db $00, $02 ; JOLTEON + db $00, $02 ; FLAREON + db $00, $02 ; PORYGON + db $00, $02 ; OMANYTE + db $00, $02 ; OMASTAR + db $00, $02 ; KABUTO + db $00, $02 ; KABUTOPS + db $00, $02 ; AERODACTYL + db $00, $02 ; SNORLAX + db $00, $02 ; ARTICUNO + db $00, $02 ; ZAPDOS + db $00, $02 ; MOLTRES + db $00, $02 ; DRATINI + db $00, $02 ; DRAGONAIR + db $00, $02 ; DRAGONITE + db $00, $02 ; MEWTWO + db $00, $02 ; MEW diff --git a/data/diglett_stage/diglett_stage_animation_data.asm b/data/diglett_stage/diglett_stage_animation_data.asm index 0a407c5..2a0384d 100755 --- a/data/diglett_stage/diglett_stage_animation_data.asm +++ b/data/diglett_stage/diglett_stage_animation_data.asm @@ -1,2275 +1,2275 @@ DiglettInitializeOrder: ; 0x19ed1 ; This list specifies the order that digletts are initialized. ; Each byte corresponds to an entry in wDiglettStates. - db $00 - db $1C - db $01 - db $1D - db $03 - db $19 - db $06 - db $15 - db $02 - db $1E - db $04 - db $1A - db $07 - db $16 - db $0A - db $11 - db $05 - db $1B - db $08 - db $17 - db $0B - db $12 - db $0E - db $09 - db $18 - db $0C - db $13 - db $0F - db $0D - db $14 - db $10 - dbw $FF, DiglettInitializeOrder ; terminator + db $00 + db $1C + db $01 + db $1D + db $03 + db $19 + db $06 + db $15 + db $02 + db $1E + db $04 + db $1A + db $07 + db $16 + db $0A + db $11 + db $05 + db $1B + db $08 + db $17 + db $0B + db $12 + db $0E + db $09 + db $18 + db $0C + db $13 + db $0F + db $0D + db $14 + db $10 + dbw $FF, DiglettInitializeOrder ; terminator DiglettUpdateOrder: ; 0x19ef3 ; This list specifies the order that digletts are updated. ; Each byte corresponds to an entry in wDiglettStates - db $00 - db $11 - db $03 - db $14 - db $06 - db $17 - db $09 - db $1A - db $0C - db $1D - db $0F - db $01 - db $12 - db $04 - db $15 - db $07 - db $18 - db $0A - db $1B - db $0D - db $1E - db $10 - db $02 - db $13 - db $05 - db $16 - db $08 - db $19 - db $0B - db $1C - db $0E - dbw $FF, DiglettUpdateOrder ; terminator + db $00 + db $11 + db $03 + db $14 + db $06 + db $17 + db $09 + db $1A + db $0C + db $1D + db $0F + db $01 + db $12 + db $04 + db $15 + db $07 + db $18 + db $0A + db $1B + db $0D + db $1E + db $10 + db $02 + db $13 + db $05 + db $16 + db $08 + db $19 + db $0B + db $1C + db $0E + dbw $FF, DiglettUpdateOrder ; terminator DiglettTileDataPointers: ; 0x19f15 - dw DiglettTileDataPointer_1a095 - dw DiglettTileDataPointer_1a089 - dw DiglettTileDataPointer_1a08c - dw DiglettTileDataPointer_1a089 - dw DiglettTileDataPointer_1a08f - dw DiglettTileDataPointer_1a092 - dw DiglettTileDataPointer_1a0a4 - dw DiglettTileDataPointer_1a098 - dw DiglettTileDataPointer_1a09b - dw DiglettTileDataPointer_1a098 - dw DiglettTileDataPointer_1a09e - dw DiglettTileDataPointer_1a0a1 - dw DiglettTileDataPointer_1a0b3 - dw DiglettTileDataPointer_1a0a7 - dw DiglettTileDataPointer_1a0aa - dw DiglettTileDataPointer_1a0a7 - dw DiglettTileDataPointer_1a0ad - dw DiglettTileDataPointer_1a0b0 - dw DiglettTileDataPointer_1a0c2 - dw DiglettTileDataPointer_1a0b6 - dw DiglettTileDataPointer_1a0b9 - dw DiglettTileDataPointer_1a0b6 - dw DiglettTileDataPointer_1a0bc - dw DiglettTileDataPointer_1a0bf - dw DiglettTileDataPointer_1a0d1 - dw DiglettTileDataPointer_1a0c5 - dw DiglettTileDataPointer_1a0c8 - dw DiglettTileDataPointer_1a0c5 - dw DiglettTileDataPointer_1a0cb - dw DiglettTileDataPointer_1a0ce - dw DiglettTileDataPointer_1a0e0 - dw DiglettTileDataPointer_1a0d4 - dw DiglettTileDataPointer_1a0d7 - dw DiglettTileDataPointer_1a0d4 - dw DiglettTileDataPointer_1a0da - dw DiglettTileDataPointer_1a0dd - dw DiglettTileDataPointer_1a0ef - dw DiglettTileDataPointer_1a0e3 - dw DiglettTileDataPointer_1a0e6 - dw DiglettTileDataPointer_1a0e3 - dw DiglettTileDataPointer_1a0e9 - dw DiglettTileDataPointer_1a0ec - dw DiglettTileDataPointer_1a0fe - dw DiglettTileDataPointer_1a0f2 - dw DiglettTileDataPointer_1a0f5 - dw DiglettTileDataPointer_1a0f2 - dw DiglettTileDataPointer_1a0f8 - dw DiglettTileDataPointer_1a0fb - dw DiglettTileDataPointer_1a10d - dw DiglettTileDataPointer_1a101 - dw DiglettTileDataPointer_1a104 - dw DiglettTileDataPointer_1a101 - dw DiglettTileDataPointer_1a107 - dw DiglettTileDataPointer_1a10a - dw DiglettTileDataPointer_1a11c - dw DiglettTileDataPointer_1a110 - dw DiglettTileDataPointer_1a113 - dw DiglettTileDataPointer_1a110 - dw DiglettTileDataPointer_1a116 - dw DiglettTileDataPointer_1a119 - dw DiglettTileDataPointer_1a12b - dw DiglettTileDataPointer_1a11f - dw DiglettTileDataPointer_1a122 - dw DiglettTileDataPointer_1a11f - dw DiglettTileDataPointer_1a125 - dw DiglettTileDataPointer_1a128 - dw DiglettTileDataPointer_1a13a - dw DiglettTileDataPointer_1a12e - dw DiglettTileDataPointer_1a131 - dw DiglettTileDataPointer_1a12e - dw DiglettTileDataPointer_1a134 - dw DiglettTileDataPointer_1a137 - dw DiglettTileDataPointer_1a149 - dw DiglettTileDataPointer_1a13d - dw DiglettTileDataPointer_1a140 - dw DiglettTileDataPointer_1a13d - dw DiglettTileDataPointer_1a143 - dw DiglettTileDataPointer_1a146 - dw DiglettTileDataPointer_1a158 - dw DiglettTileDataPointer_1a14c - dw DiglettTileDataPointer_1a14f - dw DiglettTileDataPointer_1a14c - dw DiglettTileDataPointer_1a152 - dw DiglettTileDataPointer_1a155 - dw DiglettTileDataPointer_1a167 - dw DiglettTileDataPointer_1a15b - dw DiglettTileDataPointer_1a15e - dw DiglettTileDataPointer_1a15b - dw DiglettTileDataPointer_1a161 - dw DiglettTileDataPointer_1a164 - dw DiglettTileDataPointer_1a176 - dw DiglettTileDataPointer_1a16a - dw DiglettTileDataPointer_1a16d - dw DiglettTileDataPointer_1a16a - dw DiglettTileDataPointer_1a170 - dw DiglettTileDataPointer_1a173 - dw DiglettTileDataPointer_1a185 - dw DiglettTileDataPointer_1a179 - dw DiglettTileDataPointer_1a17c - dw DiglettTileDataPointer_1a179 - dw DiglettTileDataPointer_1a17f - dw DiglettTileDataPointer_1a182 - dw DiglettTileDataPointer_1a194 - dw DiglettTileDataPointer_1a188 - dw DiglettTileDataPointer_1a18b - dw DiglettTileDataPointer_1a188 - dw DiglettTileDataPointer_1a18e - dw DiglettTileDataPointer_1a191 - dw DiglettTileDataPointer_1a1a3 - dw DiglettTileDataPointer_1a197 - dw DiglettTileDataPointer_1a19a - dw DiglettTileDataPointer_1a197 - dw DiglettTileDataPointer_1a19d - dw DiglettTileDataPointer_1a1a0 - dw DiglettTileDataPointer_1a1b2 - dw DiglettTileDataPointer_1a1a6 - dw DiglettTileDataPointer_1a1a9 - dw DiglettTileDataPointer_1a1a6 - dw DiglettTileDataPointer_1a1ac - dw DiglettTileDataPointer_1a1af - dw DiglettTileDataPointer_1a1c1 - dw DiglettTileDataPointer_1a1b5 - dw DiglettTileDataPointer_1a1b8 - dw DiglettTileDataPointer_1a1b5 - dw DiglettTileDataPointer_1a1bb - dw DiglettTileDataPointer_1a1be - dw DiglettTileDataPointer_1a1d0 - dw DiglettTileDataPointer_1a1c4 - dw DiglettTileDataPointer_1a1c7 - dw DiglettTileDataPointer_1a1c4 - dw DiglettTileDataPointer_1a1ca - dw DiglettTileDataPointer_1a1cd - dw DiglettTileDataPointer_1a1df - dw DiglettTileDataPointer_1a1d3 - dw DiglettTileDataPointer_1a1d6 - dw DiglettTileDataPointer_1a1d3 - dw DiglettTileDataPointer_1a1d9 - dw DiglettTileDataPointer_1a1dc - dw DiglettTileDataPointer_1a1ee - dw DiglettTileDataPointer_1a1e2 - dw DiglettTileDataPointer_1a1e5 - dw DiglettTileDataPointer_1a1e2 - dw DiglettTileDataPointer_1a1e8 - dw DiglettTileDataPointer_1a1eb - dw DiglettTileDataPointer_1a1fd - dw DiglettTileDataPointer_1a1f1 - dw DiglettTileDataPointer_1a1f4 - dw DiglettTileDataPointer_1a1f1 - dw DiglettTileDataPointer_1a1f7 - dw DiglettTileDataPointer_1a1fa - dw DiglettTileDataPointer_1a20c - dw DiglettTileDataPointer_1a200 - dw DiglettTileDataPointer_1a203 - dw DiglettTileDataPointer_1a200 - dw DiglettTileDataPointer_1a206 - dw DiglettTileDataPointer_1a209 - dw DiglettTileDataPointer_1a21b - dw DiglettTileDataPointer_1a20f - dw DiglettTileDataPointer_1a212 - dw DiglettTileDataPointer_1a20f - dw DiglettTileDataPointer_1a215 - dw DiglettTileDataPointer_1a218 - dw DiglettTileDataPointer_1a22a - dw DiglettTileDataPointer_1a21e - dw DiglettTileDataPointer_1a221 - dw DiglettTileDataPointer_1a21e - dw DiglettTileDataPointer_1a224 - dw DiglettTileDataPointer_1a227 - dw DiglettTileDataPointer_1a239 - dw DiglettTileDataPointer_1a22d - dw DiglettTileDataPointer_1a230 - dw DiglettTileDataPointer_1a22d - dw DiglettTileDataPointer_1a233 - dw DiglettTileDataPointer_1a236 - dw DiglettTileDataPointer_1a248 - dw DiglettTileDataPointer_1a23c - dw DiglettTileDataPointer_1a23f - dw DiglettTileDataPointer_1a23c - dw DiglettTileDataPointer_1a242 - dw DiglettTileDataPointer_1a245 - dw DiglettTileDataPointer_1a257 - dw DiglettTileDataPointer_1a24b - dw DiglettTileDataPointer_1a24e - dw DiglettTileDataPointer_1a24b - dw DiglettTileDataPointer_1a251 - dw DiglettTileDataPointer_1a254 + dw DiglettTileDataPointer_1a095 + dw DiglettTileDataPointer_1a089 + dw DiglettTileDataPointer_1a08c + dw DiglettTileDataPointer_1a089 + dw DiglettTileDataPointer_1a08f + dw DiglettTileDataPointer_1a092 + dw DiglettTileDataPointer_1a0a4 + dw DiglettTileDataPointer_1a098 + dw DiglettTileDataPointer_1a09b + dw DiglettTileDataPointer_1a098 + dw DiglettTileDataPointer_1a09e + dw DiglettTileDataPointer_1a0a1 + dw DiglettTileDataPointer_1a0b3 + dw DiglettTileDataPointer_1a0a7 + dw DiglettTileDataPointer_1a0aa + dw DiglettTileDataPointer_1a0a7 + dw DiglettTileDataPointer_1a0ad + dw DiglettTileDataPointer_1a0b0 + dw DiglettTileDataPointer_1a0c2 + dw DiglettTileDataPointer_1a0b6 + dw DiglettTileDataPointer_1a0b9 + dw DiglettTileDataPointer_1a0b6 + dw DiglettTileDataPointer_1a0bc + dw DiglettTileDataPointer_1a0bf + dw DiglettTileDataPointer_1a0d1 + dw DiglettTileDataPointer_1a0c5 + dw DiglettTileDataPointer_1a0c8 + dw DiglettTileDataPointer_1a0c5 + dw DiglettTileDataPointer_1a0cb + dw DiglettTileDataPointer_1a0ce + dw DiglettTileDataPointer_1a0e0 + dw DiglettTileDataPointer_1a0d4 + dw DiglettTileDataPointer_1a0d7 + dw DiglettTileDataPointer_1a0d4 + dw DiglettTileDataPointer_1a0da + dw DiglettTileDataPointer_1a0dd + dw DiglettTileDataPointer_1a0ef + dw DiglettTileDataPointer_1a0e3 + dw DiglettTileDataPointer_1a0e6 + dw DiglettTileDataPointer_1a0e3 + dw DiglettTileDataPointer_1a0e9 + dw DiglettTileDataPointer_1a0ec + dw DiglettTileDataPointer_1a0fe + dw DiglettTileDataPointer_1a0f2 + dw DiglettTileDataPointer_1a0f5 + dw DiglettTileDataPointer_1a0f2 + dw DiglettTileDataPointer_1a0f8 + dw DiglettTileDataPointer_1a0fb + dw DiglettTileDataPointer_1a10d + dw DiglettTileDataPointer_1a101 + dw DiglettTileDataPointer_1a104 + dw DiglettTileDataPointer_1a101 + dw DiglettTileDataPointer_1a107 + dw DiglettTileDataPointer_1a10a + dw DiglettTileDataPointer_1a11c + dw DiglettTileDataPointer_1a110 + dw DiglettTileDataPointer_1a113 + dw DiglettTileDataPointer_1a110 + dw DiglettTileDataPointer_1a116 + dw DiglettTileDataPointer_1a119 + dw DiglettTileDataPointer_1a12b + dw DiglettTileDataPointer_1a11f + dw DiglettTileDataPointer_1a122 + dw DiglettTileDataPointer_1a11f + dw DiglettTileDataPointer_1a125 + dw DiglettTileDataPointer_1a128 + dw DiglettTileDataPointer_1a13a + dw DiglettTileDataPointer_1a12e + dw DiglettTileDataPointer_1a131 + dw DiglettTileDataPointer_1a12e + dw DiglettTileDataPointer_1a134 + dw DiglettTileDataPointer_1a137 + dw DiglettTileDataPointer_1a149 + dw DiglettTileDataPointer_1a13d + dw DiglettTileDataPointer_1a140 + dw DiglettTileDataPointer_1a13d + dw DiglettTileDataPointer_1a143 + dw DiglettTileDataPointer_1a146 + dw DiglettTileDataPointer_1a158 + dw DiglettTileDataPointer_1a14c + dw DiglettTileDataPointer_1a14f + dw DiglettTileDataPointer_1a14c + dw DiglettTileDataPointer_1a152 + dw DiglettTileDataPointer_1a155 + dw DiglettTileDataPointer_1a167 + dw DiglettTileDataPointer_1a15b + dw DiglettTileDataPointer_1a15e + dw DiglettTileDataPointer_1a15b + dw DiglettTileDataPointer_1a161 + dw DiglettTileDataPointer_1a164 + dw DiglettTileDataPointer_1a176 + dw DiglettTileDataPointer_1a16a + dw DiglettTileDataPointer_1a16d + dw DiglettTileDataPointer_1a16a + dw DiglettTileDataPointer_1a170 + dw DiglettTileDataPointer_1a173 + dw DiglettTileDataPointer_1a185 + dw DiglettTileDataPointer_1a179 + dw DiglettTileDataPointer_1a17c + dw DiglettTileDataPointer_1a179 + dw DiglettTileDataPointer_1a17f + dw DiglettTileDataPointer_1a182 + dw DiglettTileDataPointer_1a194 + dw DiglettTileDataPointer_1a188 + dw DiglettTileDataPointer_1a18b + dw DiglettTileDataPointer_1a188 + dw DiglettTileDataPointer_1a18e + dw DiglettTileDataPointer_1a191 + dw DiglettTileDataPointer_1a1a3 + dw DiglettTileDataPointer_1a197 + dw DiglettTileDataPointer_1a19a + dw DiglettTileDataPointer_1a197 + dw DiglettTileDataPointer_1a19d + dw DiglettTileDataPointer_1a1a0 + dw DiglettTileDataPointer_1a1b2 + dw DiglettTileDataPointer_1a1a6 + dw DiglettTileDataPointer_1a1a9 + dw DiglettTileDataPointer_1a1a6 + dw DiglettTileDataPointer_1a1ac + dw DiglettTileDataPointer_1a1af + dw DiglettTileDataPointer_1a1c1 + dw DiglettTileDataPointer_1a1b5 + dw DiglettTileDataPointer_1a1b8 + dw DiglettTileDataPointer_1a1b5 + dw DiglettTileDataPointer_1a1bb + dw DiglettTileDataPointer_1a1be + dw DiglettTileDataPointer_1a1d0 + dw DiglettTileDataPointer_1a1c4 + dw DiglettTileDataPointer_1a1c7 + dw DiglettTileDataPointer_1a1c4 + dw DiglettTileDataPointer_1a1ca + dw DiglettTileDataPointer_1a1cd + dw DiglettTileDataPointer_1a1df + dw DiglettTileDataPointer_1a1d3 + dw DiglettTileDataPointer_1a1d6 + dw DiglettTileDataPointer_1a1d3 + dw DiglettTileDataPointer_1a1d9 + dw DiglettTileDataPointer_1a1dc + dw DiglettTileDataPointer_1a1ee + dw DiglettTileDataPointer_1a1e2 + dw DiglettTileDataPointer_1a1e5 + dw DiglettTileDataPointer_1a1e2 + dw DiglettTileDataPointer_1a1e8 + dw DiglettTileDataPointer_1a1eb + dw DiglettTileDataPointer_1a1fd + dw DiglettTileDataPointer_1a1f1 + dw DiglettTileDataPointer_1a1f4 + dw DiglettTileDataPointer_1a1f1 + dw DiglettTileDataPointer_1a1f7 + dw DiglettTileDataPointer_1a1fa + dw DiglettTileDataPointer_1a20c + dw DiglettTileDataPointer_1a200 + dw DiglettTileDataPointer_1a203 + dw DiglettTileDataPointer_1a200 + dw DiglettTileDataPointer_1a206 + dw DiglettTileDataPointer_1a209 + dw DiglettTileDataPointer_1a21b + dw DiglettTileDataPointer_1a20f + dw DiglettTileDataPointer_1a212 + dw DiglettTileDataPointer_1a20f + dw DiglettTileDataPointer_1a215 + dw DiglettTileDataPointer_1a218 + dw DiglettTileDataPointer_1a22a + dw DiglettTileDataPointer_1a21e + dw DiglettTileDataPointer_1a221 + dw DiglettTileDataPointer_1a21e + dw DiglettTileDataPointer_1a224 + dw DiglettTileDataPointer_1a227 + dw DiglettTileDataPointer_1a239 + dw DiglettTileDataPointer_1a22d + dw DiglettTileDataPointer_1a230 + dw DiglettTileDataPointer_1a22d + dw DiglettTileDataPointer_1a233 + dw DiglettTileDataPointer_1a236 + dw DiglettTileDataPointer_1a248 + dw DiglettTileDataPointer_1a23c + dw DiglettTileDataPointer_1a23f + dw DiglettTileDataPointer_1a23c + dw DiglettTileDataPointer_1a242 + dw DiglettTileDataPointer_1a245 + dw DiglettTileDataPointer_1a257 + dw DiglettTileDataPointer_1a24b + dw DiglettTileDataPointer_1a24e + dw DiglettTileDataPointer_1a24b + dw DiglettTileDataPointer_1a251 + dw DiglettTileDataPointer_1a254 DiglettTileDataPointer_1a089: ; 0x1a089 - dbw $01, DiglettTileData_1a25a + dbw $01, DiglettTileData_1a25a DiglettTileDataPointer_1a08c: ; 0x1a08c - dbw $01, DiglettTileData_1a268 + dbw $01, DiglettTileData_1a268 DiglettTileDataPointer_1a08f: ; 0x1a08f - dbw $01, DiglettTileData_1a276 + dbw $01, DiglettTileData_1a276 DiglettTileDataPointer_1a092: ; 0x1a092 - dbw $01, DiglettTileData_1a284 + dbw $01, DiglettTileData_1a284 DiglettTileDataPointer_1a095: ; 0x1a095 - dbw $01, DiglettTileData_1a292 + dbw $01, DiglettTileData_1a292 DiglettTileDataPointer_1a098: ; 0x1a098 - dbw $01, DiglettTileData_1a2a0 + dbw $01, DiglettTileData_1a2a0 DiglettTileDataPointer_1a09b: ; 0x1a09b - dbw $01, DiglettTileData_1a2ae + dbw $01, DiglettTileData_1a2ae DiglettTileDataPointer_1a09e: ; 0x1a09e - dbw $01, DiglettTileData_1a2bc + dbw $01, DiglettTileData_1a2bc DiglettTileDataPointer_1a0a1: ; 0x1a0a1 - dbw $01, DiglettTileData_1a2ca + dbw $01, DiglettTileData_1a2ca DiglettTileDataPointer_1a0a4: ; 0x1a0a4 - dbw $01, DiglettTileData_1a2d8 + dbw $01, DiglettTileData_1a2d8 DiglettTileDataPointer_1a0a7: ; 0x1a0a7 - dbw $01, DiglettTileData_1a2e6 + dbw $01, DiglettTileData_1a2e6 DiglettTileDataPointer_1a0aa: ; 0x1a0aa - dbw $01, DiglettTileData_1a2f4 + dbw $01, DiglettTileData_1a2f4 DiglettTileDataPointer_1a0ad: ; 0x1a0ad - dbw $01, DiglettTileData_1a302 + dbw $01, DiglettTileData_1a302 DiglettTileDataPointer_1a0b0: ; 0x1a0b0 - dbw $01, DiglettTileData_1a310 + dbw $01, DiglettTileData_1a310 DiglettTileDataPointer_1a0b3: ; 0x1a0b3 - dbw $01, DiglettTileData_1a31e + dbw $01, DiglettTileData_1a31e DiglettTileDataPointer_1a0b6: ; 0x1a0b6 - dbw $01, DiglettTileData_1a32c + dbw $01, DiglettTileData_1a32c DiglettTileDataPointer_1a0b9: ; 0x1a0b9 - dbw $01, DiglettTileData_1a33a + dbw $01, DiglettTileData_1a33a DiglettTileDataPointer_1a0bc: ; 0x1a0bc - dbw $01, DiglettTileData_1a348 + dbw $01, DiglettTileData_1a348 DiglettTileDataPointer_1a0bf: ; 0x1a0bf - dbw $01, DiglettTileData_1a356 + dbw $01, DiglettTileData_1a356 DiglettTileDataPointer_1a0c2: ; 0x1a0c2 - dbw $01, DiglettTileData_1a364 + dbw $01, DiglettTileData_1a364 DiglettTileDataPointer_1a0c5: ; 0x1a0c5 - dbw $01, DiglettTileData_1a372 + dbw $01, DiglettTileData_1a372 DiglettTileDataPointer_1a0c8: ; 0x1a0c8 - dbw $01, DiglettTileData_1a380 + dbw $01, DiglettTileData_1a380 DiglettTileDataPointer_1a0cb: ; 0x1a0cb - dbw $01, DiglettTileData_1a38e + dbw $01, DiglettTileData_1a38e DiglettTileDataPointer_1a0ce: ; 0x1a0ce - dbw $01, DiglettTileData_1a39c + dbw $01, DiglettTileData_1a39c DiglettTileDataPointer_1a0d1: ; 0x1a0d1 - dbw $01, DiglettTileData_1a3aa + dbw $01, DiglettTileData_1a3aa DiglettTileDataPointer_1a0d4: ; 0x1a0d4 - dbw $01, DiglettTileData_1a3b8 + dbw $01, DiglettTileData_1a3b8 DiglettTileDataPointer_1a0d7: ; 0x1a0d7 - dbw $01, DiglettTileData_1a3c6 + dbw $01, DiglettTileData_1a3c6 DiglettTileDataPointer_1a0da: ; 0x1a0da - dbw $01, DiglettTileData_1a3d4 + dbw $01, DiglettTileData_1a3d4 DiglettTileDataPointer_1a0dd: ; 0x1a0dd - dbw $01, DiglettTileData_1a3e2 + dbw $01, DiglettTileData_1a3e2 DiglettTileDataPointer_1a0e0: ; 0x1a0e0 - dbw $01, DiglettTileData_1a3f0 + dbw $01, DiglettTileData_1a3f0 DiglettTileDataPointer_1a0e3: ; 0x1a0e3 - dbw $01, DiglettTileData_1a3fe + dbw $01, DiglettTileData_1a3fe DiglettTileDataPointer_1a0e6: ; 0x1a0e6 - dbw $01, DiglettTileData_1a40c + dbw $01, DiglettTileData_1a40c DiglettTileDataPointer_1a0e9: ; 0x1a0e9 - dbw $01, DiglettTileData_1a41a + dbw $01, DiglettTileData_1a41a DiglettTileDataPointer_1a0ec: ; 0x1a0ec - dbw $01, DiglettTileData_1a428 + dbw $01, DiglettTileData_1a428 DiglettTileDataPointer_1a0ef: ; 0x1a0ef - dbw $01, DiglettTileData_1a436 + dbw $01, DiglettTileData_1a436 DiglettTileDataPointer_1a0f2: ; 0x1a0f2 - dbw $01, DiglettTileData_1a444 + dbw $01, DiglettTileData_1a444 DiglettTileDataPointer_1a0f5: ; 0x1a0f5 - dbw $01, DiglettTileData_1a452 + dbw $01, DiglettTileData_1a452 DiglettTileDataPointer_1a0f8: ; 0x1a0f8 - dbw $01, DiglettTileData_1a460 + dbw $01, DiglettTileData_1a460 DiglettTileDataPointer_1a0fb: ; 0x1a0fb - dbw $01, DiglettTileData_1a46e + dbw $01, DiglettTileData_1a46e DiglettTileDataPointer_1a0fe: ; 0x1a0fe - dbw $01, DiglettTileData_1a47c + dbw $01, DiglettTileData_1a47c DiglettTileDataPointer_1a101: ; 0x1a101 - dbw $01, DiglettTileData_1a48a + dbw $01, DiglettTileData_1a48a DiglettTileDataPointer_1a104: ; 0x1a104 - dbw $01, DiglettTileData_1a498 + dbw $01, DiglettTileData_1a498 DiglettTileDataPointer_1a107: ; 0x1a107 - dbw $01, DiglettTileData_1a4a6 + dbw $01, DiglettTileData_1a4a6 DiglettTileDataPointer_1a10a: ; 0x1a10a - dbw $01, DiglettTileData_1a4b4 + dbw $01, DiglettTileData_1a4b4 DiglettTileDataPointer_1a10d: ; 0x1a10d - dbw $01, DiglettTileData_1a4c2 + dbw $01, DiglettTileData_1a4c2 DiglettTileDataPointer_1a110: ; 0x1a110 - dbw $01, DiglettTileData_1a4d0 + dbw $01, DiglettTileData_1a4d0 DiglettTileDataPointer_1a113: ; 0x1a113 - dbw $01, DiglettTileData_1a4de + dbw $01, DiglettTileData_1a4de DiglettTileDataPointer_1a116: ; 0x1a116 - dbw $01, DiglettTileData_1a4ec + dbw $01, DiglettTileData_1a4ec DiglettTileDataPointer_1a119: ; 0x1a119 - dbw $01, DiglettTileData_1a4fa + dbw $01, DiglettTileData_1a4fa DiglettTileDataPointer_1a11c: ; 0x1a11c - dbw $01, DiglettTileData_1a508 + dbw $01, DiglettTileData_1a508 DiglettTileDataPointer_1a11f: ; 0x1a11f - dbw $01, DiglettTileData_1a516 + dbw $01, DiglettTileData_1a516 DiglettTileDataPointer_1a122: ; 0x1a122 - dbw $01, DiglettTileData_1a524 + dbw $01, DiglettTileData_1a524 DiglettTileDataPointer_1a125: ; 0x1a125 - dbw $01, DiglettTileData_1a532 + dbw $01, DiglettTileData_1a532 DiglettTileDataPointer_1a128: ; 0x1a128 - dbw $01, DiglettTileData_1a540 + dbw $01, DiglettTileData_1a540 DiglettTileDataPointer_1a12b: ; 0x1a12b - dbw $01, DiglettTileData_1a54e + dbw $01, DiglettTileData_1a54e DiglettTileDataPointer_1a12e: ; 0x1a12e - dbw $01, DiglettTileData_1a55c + dbw $01, DiglettTileData_1a55c DiglettTileDataPointer_1a131: ; 0x1a131 - dbw $01, DiglettTileData_1a56a + dbw $01, DiglettTileData_1a56a DiglettTileDataPointer_1a134: ; 0x1a134 - dbw $01, DiglettTileData_1a578 + dbw $01, DiglettTileData_1a578 DiglettTileDataPointer_1a137: ; 0x1a137 - dbw $01, DiglettTileData_1a586 + dbw $01, DiglettTileData_1a586 DiglettTileDataPointer_1a13a: ; 0x1a13a - dbw $01, DiglettTileData_1a594 + dbw $01, DiglettTileData_1a594 DiglettTileDataPointer_1a13d: ; 0x1a13d - dbw $01, DiglettTileData_1a5a2 + dbw $01, DiglettTileData_1a5a2 DiglettTileDataPointer_1a140: ; 0x1a140 - dbw $01, DiglettTileData_1a5b0 + dbw $01, DiglettTileData_1a5b0 DiglettTileDataPointer_1a143: ; 0x1a143 - dbw $01, DiglettTileData_1a5be + dbw $01, DiglettTileData_1a5be DiglettTileDataPointer_1a146: ; 0x1a146 - dbw $01, DiglettTileData_1a5cc + dbw $01, DiglettTileData_1a5cc DiglettTileDataPointer_1a149: ; 0x1a149 - dbw $01, DiglettTileData_1a5da + dbw $01, DiglettTileData_1a5da DiglettTileDataPointer_1a14c: ; 0x1a14c - dbw $01, DiglettTileData_1a5e8 + dbw $01, DiglettTileData_1a5e8 DiglettTileDataPointer_1a14f: ; 0x1a14f - dbw $01, DiglettTileData_1a5f6 + dbw $01, DiglettTileData_1a5f6 DiglettTileDataPointer_1a152: ; 0x1a152 - dbw $01, DiglettTileData_1a604 + dbw $01, DiglettTileData_1a604 DiglettTileDataPointer_1a155: ; 0x1a155 - dbw $01, DiglettTileData_1a612 + dbw $01, DiglettTileData_1a612 DiglettTileDataPointer_1a158: ; 0x1a158 - dbw $01, DiglettTileData_1a620 + dbw $01, DiglettTileData_1a620 DiglettTileDataPointer_1a15b: ; 0x1a15b - dbw $01, DiglettTileData_1a62e + dbw $01, DiglettTileData_1a62e DiglettTileDataPointer_1a15e: ; 0x1a15e - dbw $01, DiglettTileData_1a63c + dbw $01, DiglettTileData_1a63c DiglettTileDataPointer_1a161: ; 0x1a161 - dbw $01, DiglettTileData_1a64a + dbw $01, DiglettTileData_1a64a DiglettTileDataPointer_1a164: ; 0x1a164 - dbw $01, DiglettTileData_1a658 + dbw $01, DiglettTileData_1a658 DiglettTileDataPointer_1a167: ; 0x1a167 - dbw $01, DiglettTileData_1a666 + dbw $01, DiglettTileData_1a666 DiglettTileDataPointer_1a16a: ; 0x1a16a - dbw $01, DiglettTileData_1a674 + dbw $01, DiglettTileData_1a674 DiglettTileDataPointer_1a16d: ; 0x1a16d - dbw $01, DiglettTileData_1a682 + dbw $01, DiglettTileData_1a682 DiglettTileDataPointer_1a170: ; 0x1a170 - dbw $01, DiglettTileData_1a690 + dbw $01, DiglettTileData_1a690 DiglettTileDataPointer_1a173: ; 0x1a173 - dbw $01, DiglettTileData_1a69e + dbw $01, DiglettTileData_1a69e DiglettTileDataPointer_1a176: ; 0x1a176 - dbw $01, DiglettTileData_1a6ac + dbw $01, DiglettTileData_1a6ac DiglettTileDataPointer_1a179: ; 0x1a179 - dbw $01, DiglettTileData_1a6ba + dbw $01, DiglettTileData_1a6ba DiglettTileDataPointer_1a17c: ; 0x1a17c - dbw $01, DiglettTileData_1a6c8 + dbw $01, DiglettTileData_1a6c8 DiglettTileDataPointer_1a17f: ; 0x1a17f - dbw $01, DiglettTileData_1a6d6 + dbw $01, DiglettTileData_1a6d6 DiglettTileDataPointer_1a182: ; 0x1a182 - dbw $01, DiglettTileData_1a6e4 + dbw $01, DiglettTileData_1a6e4 DiglettTileDataPointer_1a185: ; 0x1a185 - dbw $01, DiglettTileData_1a6f2 + dbw $01, DiglettTileData_1a6f2 DiglettTileDataPointer_1a188: ; 0x1a188 - dbw $01, DiglettTileData_1a700 + dbw $01, DiglettTileData_1a700 DiglettTileDataPointer_1a18b: ; 0x1a18b - dbw $01, DiglettTileData_1a70e + dbw $01, DiglettTileData_1a70e DiglettTileDataPointer_1a18e: ; 0x1a18e - dbw $01, DiglettTileData_1a71c + dbw $01, DiglettTileData_1a71c DiglettTileDataPointer_1a191: ; 0x1a191 - dbw $01, DiglettTileData_1a72a + dbw $01, DiglettTileData_1a72a DiglettTileDataPointer_1a194: ; 0x1a194 - dbw $01, DiglettTileData_1a738 + dbw $01, DiglettTileData_1a738 DiglettTileDataPointer_1a197: ; 0x1a197 - dbw $01, DiglettTileData_1a746 + dbw $01, DiglettTileData_1a746 DiglettTileDataPointer_1a19a: ; 0x1a19a - dbw $01, DiglettTileData_1a754 + dbw $01, DiglettTileData_1a754 DiglettTileDataPointer_1a19d: ; 0x1a19d - dbw $01, DiglettTileData_1a762 + dbw $01, DiglettTileData_1a762 DiglettTileDataPointer_1a1a0: ; 0x1a1a0 - dbw $01, DiglettTileData_1a770 + dbw $01, DiglettTileData_1a770 DiglettTileDataPointer_1a1a3: ; 0x1a1a3 - dbw $01, DiglettTileData_1a77e + dbw $01, DiglettTileData_1a77e DiglettTileDataPointer_1a1a6: ; 0x1a1a6 - dbw $01, DiglettTileData_1a78c + dbw $01, DiglettTileData_1a78c DiglettTileDataPointer_1a1a9: ; 0x1a1a9 - dbw $01, DiglettTileData_1a79a + dbw $01, DiglettTileData_1a79a DiglettTileDataPointer_1a1ac: ; 0x1a1ac - dbw $01, DiglettTileData_1a7a8 + dbw $01, DiglettTileData_1a7a8 DiglettTileDataPointer_1a1af: ; 0x1a1af - dbw $01, DiglettTileData_1a7b6 + dbw $01, DiglettTileData_1a7b6 DiglettTileDataPointer_1a1b2: ; 0x1a1b2 - dbw $01, DiglettTileData_1a7c4 + dbw $01, DiglettTileData_1a7c4 DiglettTileDataPointer_1a1b5: ; 0x1a1b5 - dbw $01, DiglettTileData_1a7d2 + dbw $01, DiglettTileData_1a7d2 DiglettTileDataPointer_1a1b8: ; 0x1a1b8 - dbw $01, DiglettTileData_1a7e0 + dbw $01, DiglettTileData_1a7e0 DiglettTileDataPointer_1a1bb: ; 0x1a1bb - dbw $01, DiglettTileData_1a7ee + dbw $01, DiglettTileData_1a7ee DiglettTileDataPointer_1a1be: ; 0x1a1be - dbw $01, DiglettTileData_1a7fc + dbw $01, DiglettTileData_1a7fc DiglettTileDataPointer_1a1c1: ; 0x1a1c1 - dbw $01, DiglettTileData_1a80a + dbw $01, DiglettTileData_1a80a DiglettTileDataPointer_1a1c4: ; 0x1a1c4 - dbw $01, DiglettTileData_1a818 + dbw $01, DiglettTileData_1a818 DiglettTileDataPointer_1a1c7: ; 0x1a1c7 - dbw $01, DiglettTileData_1a826 + dbw $01, DiglettTileData_1a826 DiglettTileDataPointer_1a1ca: ; 0x1a1ca - dbw $01, DiglettTileData_1a834 + dbw $01, DiglettTileData_1a834 DiglettTileDataPointer_1a1cd: ; 0x1a1cd - dbw $01, DiglettTileData_1a842 + dbw $01, DiglettTileData_1a842 DiglettTileDataPointer_1a1d0: ; 0x1a1d0 - dbw $01, DiglettTileData_1a850 + dbw $01, DiglettTileData_1a850 DiglettTileDataPointer_1a1d3: ; 0x1a1d3 - dbw $01, DiglettTileData_1a85e + dbw $01, DiglettTileData_1a85e DiglettTileDataPointer_1a1d6: ; 0x1a1d6 - dbw $01, DiglettTileData_1a86c + dbw $01, DiglettTileData_1a86c DiglettTileDataPointer_1a1d9: ; 0x1a1d9 - dbw $01, DiglettTileData_1a87a + dbw $01, DiglettTileData_1a87a DiglettTileDataPointer_1a1dc: ; 0x1a1dc - dbw $01, DiglettTileData_1a888 + dbw $01, DiglettTileData_1a888 DiglettTileDataPointer_1a1df: ; 0x1a1df - dbw $01, DiglettTileData_1a896 + dbw $01, DiglettTileData_1a896 DiglettTileDataPointer_1a1e2: ; 0x1a1e2 - dbw $01, DiglettTileData_1a8a4 + dbw $01, DiglettTileData_1a8a4 DiglettTileDataPointer_1a1e5: ; 0x1a1e5 - dbw $01, DiglettTileData_1a8b2 + dbw $01, DiglettTileData_1a8b2 DiglettTileDataPointer_1a1e8: ; 0x1a1e8 - dbw $01, DiglettTileData_1a8c0 + dbw $01, DiglettTileData_1a8c0 DiglettTileDataPointer_1a1eb: ; 0x1a1eb - dbw $01, DiglettTileData_1a8ce + dbw $01, DiglettTileData_1a8ce DiglettTileDataPointer_1a1ee: ; 0x1a1ee - dbw $01, DiglettTileData_1a8dc + dbw $01, DiglettTileData_1a8dc DiglettTileDataPointer_1a1f1: ; 0x1a1f1 - dbw $01, DiglettTileData_1a8ea + dbw $01, DiglettTileData_1a8ea DiglettTileDataPointer_1a1f4: ; 0x1a1f4 - dbw $01, DiglettTileData_1a8f8 + dbw $01, DiglettTileData_1a8f8 DiglettTileDataPointer_1a1f7: ; 0x1a1f7 - dbw $01, DiglettTileData_1a906 + dbw $01, DiglettTileData_1a906 DiglettTileDataPointer_1a1fa: ; 0x1a1fa - dbw $01, DiglettTileData_1a914 + dbw $01, DiglettTileData_1a914 DiglettTileDataPointer_1a1fd: ; 0x1a1fd - dbw $01, DiglettTileData_1a922 + dbw $01, DiglettTileData_1a922 DiglettTileDataPointer_1a200: ; 0x1a200 - dbw $01, DiglettTileData_1a930 + dbw $01, DiglettTileData_1a930 DiglettTileDataPointer_1a203: ; 0x1a203 - dbw $01, DiglettTileData_1a93e + dbw $01, DiglettTileData_1a93e DiglettTileDataPointer_1a206: ; 0x1a206 - dbw $01, DiglettTileData_1a94c + dbw $01, DiglettTileData_1a94c DiglettTileDataPointer_1a209: ; 0x1a209 - dbw $01, DiglettTileData_1a95a + dbw $01, DiglettTileData_1a95a DiglettTileDataPointer_1a20c: ; 0x1a20c - dbw $01, DiglettTileData_1a968 + dbw $01, DiglettTileData_1a968 DiglettTileDataPointer_1a20f: ; 0x1a20f - dbw $01, DiglettTileData_1a976 + dbw $01, DiglettTileData_1a976 DiglettTileDataPointer_1a212: ; 0x1a212 - dbw $01, DiglettTileData_1a984 + dbw $01, DiglettTileData_1a984 DiglettTileDataPointer_1a215: ; 0x1a215 - dbw $01, DiglettTileData_1a992 + dbw $01, DiglettTileData_1a992 DiglettTileDataPointer_1a218: ; 0x1a218 - dbw $01, DiglettTileData_1a9a0 + dbw $01, DiglettTileData_1a9a0 DiglettTileDataPointer_1a21b: ; 0x1a21b - dbw $01, DiglettTileData_1a9ae + dbw $01, DiglettTileData_1a9ae DiglettTileDataPointer_1a21e: ; 0x1a21e - dbw $01, DiglettTileData_1a9bc + dbw $01, DiglettTileData_1a9bc DiglettTileDataPointer_1a221: ; 0x1a221 - dbw $01, DiglettTileData_1a9ca + dbw $01, DiglettTileData_1a9ca DiglettTileDataPointer_1a224: ; 0x1a224 - dbw $01, DiglettTileData_1a9d8 + dbw $01, DiglettTileData_1a9d8 DiglettTileDataPointer_1a227: ; 0x1a227 - dbw $01, DiglettTileData_1a9e6 + dbw $01, DiglettTileData_1a9e6 DiglettTileDataPointer_1a22a: ; 0x1a22a - dbw $01, DiglettTileData_1a9f4 + dbw $01, DiglettTileData_1a9f4 DiglettTileDataPointer_1a22d: ; 0x1a22d - dbw $01, DiglettTileData_1aa02 + dbw $01, DiglettTileData_1aa02 DiglettTileDataPointer_1a230: ; 0x1a230 - dbw $01, DiglettTileData_1aa10 + dbw $01, DiglettTileData_1aa10 DiglettTileDataPointer_1a233: ; 0x1a233 - dbw $01, DiglettTileData_1aa1e + dbw $01, DiglettTileData_1aa1e DiglettTileDataPointer_1a236: ; 0x1a236 - dbw $01, DiglettTileData_1aa2c + dbw $01, DiglettTileData_1aa2c DiglettTileDataPointer_1a239: ; 0x1a239 - dbw $01, DiglettTileData_1aa3a + dbw $01, DiglettTileData_1aa3a DiglettTileDataPointer_1a23c: ; 0x1a23c - dbw $01, DiglettTileData_1aa48 + dbw $01, DiglettTileData_1aa48 DiglettTileDataPointer_1a23f: ; 0x1a23f - dbw $01, DiglettTileData_1aa56 + dbw $01, DiglettTileData_1aa56 DiglettTileDataPointer_1a242: ; 0x1a242 - dbw $01, DiglettTileData_1aa64 + dbw $01, DiglettTileData_1aa64 DiglettTileDataPointer_1a245: ; 0x1a245 - dbw $01, DiglettTileData_1aa72 + dbw $01, DiglettTileData_1aa72 DiglettTileDataPointer_1a248: ; 0x1a248 - dbw $01, DiglettTileData_1aa80 + dbw $01, DiglettTileData_1aa80 DiglettTileDataPointer_1a24b: ; 0x1a24b - dbw $01, DiglettTileData_1aa8e + dbw $01, DiglettTileData_1aa8e DiglettTileDataPointer_1a24e: ; 0x1a24e - dbw $01, DiglettTileData_1aa9c + dbw $01, DiglettTileData_1aa9c DiglettTileDataPointer_1a251: ; 0x1a251 - dbw $01, DiglettTileData_1aaaa + dbw $01, DiglettTileData_1aaaa DiglettTileDataPointer_1a254: ; 0x1a254 - dbw $01, DiglettTileData_1aab8 + dbw $01, DiglettTileData_1aab8 DiglettTileDataPointer_1a257: ; 0x1a257 - dbw $01, DiglettTileData_1aac6 + dbw $01, DiglettTileData_1aac6 DiglettTileData_1a25a: ; 0x1a25a - dw LoadTileLists - db $04 - db $02 - dw $9861 - db $35, $36 - db $02 - dw $9881 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9861 + db $35, $36 + db $02 + dw $9881 + db $37, $38 + db $00 ; terminator DiglettTileData_1a268: ; 0x1a268 - dw LoadTileLists - db $04 - db $02 - dw $9861 - db $39, $3A - db $02 - dw $9881 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9861 + db $39, $3A + db $02 + dw $9881 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a276: ; 0x1a276 - dw LoadTileLists - db $04 - db $02 - dw $9861 - db $3D, $3E - db $02 - dw $9881 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9861 + db $3D, $3E + db $02 + dw $9881 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a284: ; 0x1a284 - dw LoadTileLists - db $04 - db $02 - dw $9861 - db $41, $42 - db $02 - dw $9881 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9861 + db $41, $42 + db $02 + dw $9881 + db $43, $44 + db $00 ; terminator DiglettTileData_1a292: ; 0x1a292 - dw LoadTileLists - db $04 - db $02 - dw $9861 - db $45, $46 - db $02 - dw $9881 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9861 + db $45, $46 + db $02 + dw $9881 + db $47, $48 + db $00 ; terminator DiglettTileData_1a2a0: ; 0x1a2a0 - dw LoadTileLists - db $04 - db $02 - dw $98A1 - db $35, $36 - db $02 - dw $98C1 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A1 + db $35, $36 + db $02 + dw $98C1 + db $37, $38 + db $00 ; terminator DiglettTileData_1a2ae: ; 0x1a2ae - dw LoadTileLists - db $04 - db $02 - dw $98A1 - db $39, $3A - db $02 - dw $98C1 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A1 + db $39, $3A + db $02 + dw $98C1 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a2bc: ; 0x1a2bc - dw LoadTileLists - db $04 - db $02 - dw $98A1 - db $3D, $3E - db $02 - dw $98C1 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A1 + db $3D, $3E + db $02 + dw $98C1 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a2ca: ; 0x1a2ca - dw LoadTileLists - db $04 - db $02 - dw $98A1 - db $41, $42 - db $02 - dw $98C1 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A1 + db $41, $42 + db $02 + dw $98C1 + db $43, $44 + db $00 ; terminator DiglettTileData_1a2d8: ; 0x1a2d8 - dw LoadTileLists - db $04 - db $02 - dw $98A1 - db $45, $46 - db $02 - dw $98C1 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A1 + db $45, $46 + db $02 + dw $98C1 + db $47, $48 + db $00 ; terminator DiglettTileData_1a2e6: ; 0x1a2e6 - dw LoadTileLists - db $04 - db $02 - dw $98E1 - db $35, $36 - db $02 - dw $9901 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E1 + db $35, $36 + db $02 + dw $9901 + db $37, $38 + db $00 ; terminator DiglettTileData_1a2f4: ; 0x1a2f4 - dw LoadTileLists - db $04 - db $02 - dw $98E1 - db $39, $3A - db $02 - dw $9901 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E1 + db $39, $3A + db $02 + dw $9901 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a302: ; 0x1a302 - dw LoadTileLists - db $04 - db $02 - dw $98E1 - db $3D, $3E - db $02 - dw $9901 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E1 + db $3D, $3E + db $02 + dw $9901 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a310: ; 0x1a310 - dw LoadTileLists - db $04 - db $02 - dw $98E1 - db $41, $42 - db $02 - dw $9901 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E1 + db $41, $42 + db $02 + dw $9901 + db $43, $44 + db $00 ; terminator DiglettTileData_1a31e: ; 0x1a31e - dw LoadTileLists - db $04 - db $02 - dw $98E1 - db $45, $46 - db $02 - dw $9901 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E1 + db $45, $46 + db $02 + dw $9901 + db $47, $48 + db $00 ; terminator DiglettTileData_1a32c: ; 0x1a32c - dw LoadTileLists - db $04 - db $02 - dw $9883 - db $35, $36 - db $02 - dw $98A3 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9883 + db $35, $36 + db $02 + dw $98A3 + db $37, $38 + db $00 ; terminator DiglettTileData_1a33a: ; 0x1a33a - dw LoadTileLists - db $04 - db $02 - dw $9883 - db $39, $3A - db $02 - dw $98A3 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9883 + db $39, $3A + db $02 + dw $98A3 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a348: ; 0x1a348 - dw LoadTileLists - db $04 - db $02 - dw $9883 - db $3D, $3E - db $02 - dw $98A3 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9883 + db $3D, $3E + db $02 + dw $98A3 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a356: ; 0x1a356 - dw LoadTileLists - db $04 - db $02 - dw $9883 - db $41, $42 - db $02 - dw $98A3 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9883 + db $41, $42 + db $02 + dw $98A3 + db $43, $44 + db $00 ; terminator DiglettTileData_1a364: ; 0x1a364 - dw LoadTileLists - db $04 - db $02 - dw $9883 - db $45, $46 - db $02 - dw $98A3 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9883 + db $45, $46 + db $02 + dw $98A3 + db $47, $48 + db $00 ; terminator DiglettTileData_1a372: ; 0x1a372 - dw LoadTileLists - db $04 - db $02 - dw $98C3 - db $35, $36 - db $02 - dw $98E3 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C3 + db $35, $36 + db $02 + dw $98E3 + db $37, $38 + db $00 ; terminator DiglettTileData_1a380: ; 0x1a380 - dw LoadTileLists - db $04 - db $02 - dw $98C3 - db $39, $3A - db $02 - dw $98E3 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C3 + db $39, $3A + db $02 + dw $98E3 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a38e: ; 0x1a38e - dw LoadTileLists - db $04 - db $02 - dw $98C3 - db $3D, $3E - db $02 - dw $98E3 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C3 + db $3D, $3E + db $02 + dw $98E3 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a39c: ; 0x1a39c - dw LoadTileLists - db $04 - db $02 - dw $98C3 - db $41, $42 - db $02 - dw $98E3 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C3 + db $41, $42 + db $02 + dw $98E3 + db $43, $44 + db $00 ; terminator DiglettTileData_1a3aa: ; 0x1a3aa - dw LoadTileLists - db $04 - db $02 - dw $98C3 - db $45, $46 - db $02 - dw $98E3 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C3 + db $45, $46 + db $02 + dw $98E3 + db $47, $48 + db $00 ; terminator DiglettTileData_1a3b8: ; 0x1a3b8 - dw LoadTileLists - db $04 - db $02 - dw $9903 - db $35, $36 - db $02 - dw $9923 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9903 + db $35, $36 + db $02 + dw $9923 + db $37, $38 + db $00 ; terminator DiglettTileData_1a3c6: ; 0x1a3c6 - dw LoadTileLists - db $04 - db $02 - dw $9903 - db $39, $3A - db $02 - dw $9923 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9903 + db $39, $3A + db $02 + dw $9923 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a3d4: ; 0x1a3d4 - dw LoadTileLists - db $04 - db $02 - dw $9903 - db $3D, $3E - db $02 - dw $9923 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9903 + db $3D, $3E + db $02 + dw $9923 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a3e2: ; 0x1a3e2 - dw LoadTileLists - db $04 - db $02 - dw $9903 - db $41, $42 - db $02 - dw $9923 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9903 + db $41, $42 + db $02 + dw $9923 + db $43, $44 + db $00 ; terminator DiglettTileData_1a3f0: ; 0x1a3f0 - dw LoadTileLists - db $04 - db $02 - dw $9903 - db $45, $46 - db $02 - dw $9923 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9903 + db $45, $46 + db $02 + dw $9923 + db $47, $48 + db $00 ; terminator DiglettTileData_1a3fe: ; 0x1a3fe - dw LoadTileLists - db $04 - db $02 - dw $9865 - db $35, $36 - db $02 - dw $9885 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9865 + db $35, $36 + db $02 + dw $9885 + db $37, $38 + db $00 ; terminator DiglettTileData_1a40c: ; 0x1a40c - dw LoadTileLists - db $04 - db $02 - dw $9865 - db $39, $3A - db $02 - dw $9885 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9865 + db $39, $3A + db $02 + dw $9885 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a41a: ; 0x1a41a - dw LoadTileLists - db $04 - db $02 - dw $9865 - db $3D, $3E - db $02 - dw $9885 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9865 + db $3D, $3E + db $02 + dw $9885 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a428: ; 0x1a428 - dw LoadTileLists - db $04 - db $02 - dw $9865 - db $41, $42 - db $02 - dw $9885 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9865 + db $41, $42 + db $02 + dw $9885 + db $43, $44 + db $00 ; terminator DiglettTileData_1a436: ; 0x1a436 - dw LoadTileLists - db $04 - db $02 - dw $9865 - db $45, $46 - db $02 - dw $9885 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9865 + db $45, $46 + db $02 + dw $9885 + db $47, $48 + db $00 ; terminator DiglettTileData_1a444: ; 0x1a444 - dw LoadTileLists - db $04 - db $02 - dw $98A5 - db $35, $36 - db $02 - dw $98C5 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A5 + db $35, $36 + db $02 + dw $98C5 + db $37, $38 + db $00 ; terminator DiglettTileData_1a452: ; 0x1a452 - dw LoadTileLists - db $04 - db $02 - dw $98A5 - db $39, $3A - db $02 - dw $98C5 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A5 + db $39, $3A + db $02 + dw $98C5 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a460: ; 0x1a460 - dw LoadTileLists - db $04 - db $02 - dw $98A5 - db $3D, $3E - db $02 - dw $98C5 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A5 + db $3D, $3E + db $02 + dw $98C5 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a46e: ; 0x1a46e - dw LoadTileLists - db $04 - db $02 - dw $98A5 - db $41, $42 - db $02 - dw $98C5 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A5 + db $41, $42 + db $02 + dw $98C5 + db $43, $44 + db $00 ; terminator DiglettTileData_1a47c: ; 0x1a47c - dw LoadTileLists - db $04 - db $02 - dw $98A5 - db $45, $46 - db $02 - dw $98C5 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A5 + db $45, $46 + db $02 + dw $98C5 + db $47, $48 + db $00 ; terminator DiglettTileData_1a48a: ; 0x1a48a - dw LoadTileLists - db $04 - db $02 - dw $98E5 - db $35, $36 - db $02 - dw $9905 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E5 + db $35, $36 + db $02 + dw $9905 + db $37, $38 + db $00 ; terminator DiglettTileData_1a498: ; 0x1a498 - dw LoadTileLists - db $04 - db $02 - dw $98E5 - db $39, $3A - db $02 - dw $9905 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E5 + db $39, $3A + db $02 + dw $9905 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a4a6: ; 0x1a4a6 - dw LoadTileLists - db $04 - db $02 - dw $98E5 - db $3D, $3E - db $02 - dw $9905 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E5 + db $3D, $3E + db $02 + dw $9905 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a4b4: ; 0x1a4b4 - dw LoadTileLists - db $04 - db $02 - dw $98E5 - db $41, $42 - db $02 - dw $9905 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E5 + db $41, $42 + db $02 + dw $9905 + db $43, $44 + db $00 ; terminator DiglettTileData_1a4c2: ; 0x1a4c2 - dw LoadTileLists - db $04 - db $02 - dw $98E5 - db $45, $46 - db $02 - dw $9905 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E5 + db $45, $46 + db $02 + dw $9905 + db $47, $48 + db $00 ; terminator DiglettTileData_1a4d0: ; 0x1a4d0 - dw LoadTileLists - db $04 - db $02 - dw $9925 - db $35, $36 - db $02 - dw $9945 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9925 + db $35, $36 + db $02 + dw $9945 + db $37, $38 + db $00 ; terminator DiglettTileData_1a4de: ; 0x1a4de - dw LoadTileLists - db $04 - db $02 - dw $9925 - db $39, $3A - db $02 - dw $9945 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9925 + db $39, $3A + db $02 + dw $9945 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a4ec: ; 0x1a4ec - dw LoadTileLists - db $04 - db $02 - dw $9925 - db $3D, $3E - db $02 - dw $9945 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9925 + db $3D, $3E + db $02 + dw $9945 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a4fa: ; 0x1a4fa - dw LoadTileLists - db $04 - db $02 - dw $9925 - db $41, $42 - db $02 - dw $9945 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9925 + db $41, $42 + db $02 + dw $9945 + db $43, $44 + db $00 ; terminator DiglettTileData_1a508: ; 0x1a508 - dw LoadTileLists - db $04 - db $02 - dw $9925 - db $45, $46 - db $02 - dw $9945 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9925 + db $45, $46 + db $02 + dw $9945 + db $47, $48 + db $00 ; terminator DiglettTileData_1a516: ; 0x1a516 - dw LoadTileLists - db $04 - db $02 - dw $9887 - db $35, $36 - db $02 - dw $98A7 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9887 + db $35, $36 + db $02 + dw $98A7 + db $37, $38 + db $00 ; terminator DiglettTileData_1a524: ; 0x1a524 - dw LoadTileLists - db $04 - db $02 - dw $9887 - db $39, $3A - db $02 - dw $98A7 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9887 + db $39, $3A + db $02 + dw $98A7 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a532: ; 0x1a532 - dw LoadTileLists - db $04 - db $02 - dw $9887 - db $3D, $3E - db $02 - dw $98A7 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9887 + db $3D, $3E + db $02 + dw $98A7 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a540: ; 0x1a540 - dw LoadTileLists - db $04 - db $02 - dw $9887 - db $41, $42 - db $02 - dw $98A7 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9887 + db $41, $42 + db $02 + dw $98A7 + db $43, $44 + db $00 ; terminator DiglettTileData_1a54e: ; 0x1a54e - dw LoadTileLists - db $04 - db $02 - dw $9887 - db $45, $46 - db $02 - dw $98A7 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9887 + db $45, $46 + db $02 + dw $98A7 + db $47, $48 + db $00 ; terminator DiglettTileData_1a55c: ; 0x1a55c - dw LoadTileLists - db $04 - db $02 - dw $98C7 - db $35, $36 - db $02 - dw $98E7 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C7 + db $35, $36 + db $02 + dw $98E7 + db $37, $38 + db $00 ; terminator DiglettTileData_1a56a: ; 0x1a56a - dw LoadTileLists - db $04 - db $02 - dw $98C7 - db $39, $3A - db $02 - dw $98E7 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C7 + db $39, $3A + db $02 + dw $98E7 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a578: ; 0x1a578 - dw LoadTileLists - db $04 - db $02 - dw $98C7 - db $3D, $3E - db $02 - dw $98E7 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C7 + db $3D, $3E + db $02 + dw $98E7 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a586: ; 0x1a586 - dw LoadTileLists - db $04 - db $02 - dw $98C7 - db $41, $42 - db $02 - dw $98E7 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C7 + db $41, $42 + db $02 + dw $98E7 + db $43, $44 + db $00 ; terminator DiglettTileData_1a594: ; 0x1a594 - dw LoadTileLists - db $04 - db $02 - dw $98C7 - db $45, $46 - db $02 - dw $98E7 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98C7 + db $45, $46 + db $02 + dw $98E7 + db $47, $48 + db $00 ; terminator DiglettTileData_1a5a2: ; 0x1a5a2 - dw LoadTileLists - db $04 - db $02 - dw $9907 - db $35, $36 - db $02 - dw $9927 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9907 + db $35, $36 + db $02 + dw $9927 + db $37, $38 + db $00 ; terminator DiglettTileData_1a5b0: ; 0x1a5b0 - dw LoadTileLists - db $04 - db $02 - dw $9907 - db $39, $3A - db $02 - dw $9927 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9907 + db $39, $3A + db $02 + dw $9927 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a5be: ; 0x1a5be - dw LoadTileLists - db $04 - db $02 - dw $9907 - db $3D, $3E - db $02 - dw $9927 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9907 + db $3D, $3E + db $02 + dw $9927 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a5cc: ; 0x1a5cc - dw LoadTileLists - db $04 - db $02 - dw $9907 - db $41, $42 - db $02 - dw $9927 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9907 + db $41, $42 + db $02 + dw $9927 + db $43, $44 + db $00 ; terminator DiglettTileData_1a5da: ; 0x1a5da - dw LoadTileLists - db $04 - db $02 - dw $9907 - db $45, $46 - db $02 - dw $9927 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9907 + db $45, $46 + db $02 + dw $9927 + db $47, $48 + db $00 ; terminator DiglettTileData_1a5e8: ; 0x1a5e8 - dw LoadTileLists - db $04 - db $02 - dw $9947 - db $35, $36 - db $02 - dw $9967 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9947 + db $35, $36 + db $02 + dw $9967 + db $37, $38 + db $00 ; terminator DiglettTileData_1a5f6: ; 0x1a5f6 - dw LoadTileLists - db $04 - db $02 - dw $9947 - db $39, $3A - db $02 - dw $9967 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9947 + db $39, $3A + db $02 + dw $9967 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a604: ; 0x1a604 - dw LoadTileLists - db $04 - db $02 - dw $9947 - db $3D, $3E - db $02 - dw $9967 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9947 + db $3D, $3E + db $02 + dw $9967 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a612: ; 0x1a612 - dw LoadTileLists - db $04 - db $02 - dw $9947 - db $41, $42 - db $02 - dw $9967 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9947 + db $41, $42 + db $02 + dw $9967 + db $43, $44 + db $00 ; terminator DiglettTileData_1a620: ; 0x1a620 - dw LoadTileLists - db $04 - db $02 - dw $9947 - db $45, $46 - db $02 - dw $9967 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9947 + db $45, $46 + db $02 + dw $9967 + db $47, $48 + db $00 ; terminator DiglettTileData_1a62e: ; 0x1a62e - dw LoadTileLists - db $04 - db $02 - dw $98A9 - db $35, $36 - db $02 - dw $98C9 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A9 + db $35, $36 + db $02 + dw $98C9 + db $37, $38 + db $00 ; terminator DiglettTileData_1a63c: ; 0x1a63c - dw LoadTileLists - db $04 - db $02 - dw $98A9 - db $39, $3A - db $02 - dw $98C9 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A9 + db $39, $3A + db $02 + dw $98C9 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a64a: ; 0x1a64a - dw LoadTileLists - db $04 - db $02 - dw $98A9 - db $3D, $3E - db $02 - dw $98C9 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A9 + db $3D, $3E + db $02 + dw $98C9 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a658: ; 0x1a658 - dw LoadTileLists - db $04 - db $02 - dw $98A9 - db $41, $42 - db $02 - dw $98C9 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A9 + db $41, $42 + db $02 + dw $98C9 + db $43, $44 + db $00 ; terminator DiglettTileData_1a666: ; 0x1a666 - dw LoadTileLists - db $04 - db $02 - dw $98A9 - db $45, $46 - db $02 - dw $98C9 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98A9 + db $45, $46 + db $02 + dw $98C9 + db $47, $48 + db $00 ; terminator DiglettTileData_1a674: ; 0x1a674 - dw LoadTileLists - db $04 - db $02 - dw $98E9 - db $35, $36 - db $02 - dw $9909 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E9 + db $35, $36 + db $02 + dw $9909 + db $37, $38 + db $00 ; terminator DiglettTileData_1a682: ; 0x1a682 - dw LoadTileLists - db $04 - db $02 - dw $98E9 - db $39, $3A - db $02 - dw $9909 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E9 + db $39, $3A + db $02 + dw $9909 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a690: ; 0x1a690 - dw LoadTileLists - db $04 - db $02 - dw $98E9 - db $3D, $3E - db $02 - dw $9909 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E9 + db $3D, $3E + db $02 + dw $9909 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a69e: ; 0x1a69e - dw LoadTileLists - db $04 - db $02 - dw $98E9 - db $41, $42 - db $02 - dw $9909 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E9 + db $41, $42 + db $02 + dw $9909 + db $43, $44 + db $00 ; terminator DiglettTileData_1a6ac: ; 0x1a6ac - dw LoadTileLists - db $04 - db $02 - dw $98E9 - db $45, $46 - db $02 - dw $9909 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98E9 + db $45, $46 + db $02 + dw $9909 + db $47, $48 + db $00 ; terminator DiglettTileData_1a6ba: ; 0x1a6ba - dw LoadTileLists - db $04 - db $02 - dw $9929 - db $35, $36 - db $02 - dw $9949 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9929 + db $35, $36 + db $02 + dw $9949 + db $37, $38 + db $00 ; terminator DiglettTileData_1a6c8: ; 0x1a6c8 - dw LoadTileLists - db $04 - db $02 - dw $9929 - db $39, $3A - db $02 - dw $9949 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9929 + db $39, $3A + db $02 + dw $9949 + db $3B, $3C + db $00 ; terminator DiglettTileData_1a6d6: ; 0x1a6d6 - dw LoadTileLists - db $04 - db $02 - dw $9929 - db $3D, $3E - db $02 - dw $9949 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9929 + db $3D, $3E + db $02 + dw $9949 + db $3F, $40 + db $00 ; terminator DiglettTileData_1a6e4: ; 0x1a6e4 - dw LoadTileLists - db $04 - db $02 - dw $9929 - db $41, $42 - db $02 - dw $9949 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9929 + db $41, $42 + db $02 + dw $9949 + db $43, $44 + db $00 ; terminator DiglettTileData_1a6f2: ; 0x1a6f2 - dw LoadTileLists - db $04 - db $02 - dw $9929 - db $45, $46 - db $02 - dw $9949 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9929 + db $45, $46 + db $02 + dw $9949 + db $47, $48 + db $00 ; terminator DiglettTileData_1a700: ; 0x1a700 - dw LoadTileLists - db $04 - db $02 - dw $988B - db $35, $36 - db $02 - dw $98AB - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988B + db $35, $36 + db $02 + dw $98AB + db $37, $38 + db $00 ; terminator DiglettTileData_1a70e: ; 0x1a70e - dw LoadTileLists - db $04 - db $02 - dw $988B - db $39, $3A - db $02 - dw $98AB - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988B + db $39, $3A + db $02 + dw $98AB + db $3B, $3C + db $00 ; terminator DiglettTileData_1a71c: ; 0x1a71c - dw LoadTileLists - db $04 - db $02 - dw $988B - db $3D, $3E - db $02 - dw $98AB - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988B + db $3D, $3E + db $02 + dw $98AB + db $3F, $40 + db $00 ; terminator DiglettTileData_1a72a: ; 0x1a72a - dw LoadTileLists - db $04 - db $02 - dw $988B - db $41, $42 - db $02 - dw $98AB - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988B + db $41, $42 + db $02 + dw $98AB + db $43, $44 + db $00 ; terminator DiglettTileData_1a738: ; 0x1a738 - dw LoadTileLists - db $04 - db $02 - dw $988B - db $45, $46 - db $02 - dw $98AB - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988B + db $45, $46 + db $02 + dw $98AB + db $47, $48 + db $00 ; terminator DiglettTileData_1a746: ; 0x1a746 - dw LoadTileLists - db $04 - db $02 - dw $98CB - db $35, $36 - db $02 - dw $98EB - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CB + db $35, $36 + db $02 + dw $98EB + db $37, $38 + db $00 ; terminator DiglettTileData_1a754: ; 0x1a754 - dw LoadTileLists - db $04 - db $02 - dw $98CB - db $39, $3A - db $02 - dw $98EB - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CB + db $39, $3A + db $02 + dw $98EB + db $3B, $3C + db $00 ; terminator DiglettTileData_1a762: ; 0x1a762 - dw LoadTileLists - db $04 - db $02 - dw $98CB - db $3D, $3E - db $02 - dw $98EB - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CB + db $3D, $3E + db $02 + dw $98EB + db $3F, $40 + db $00 ; terminator DiglettTileData_1a770: ; 0x1a770 - dw LoadTileLists - db $04 - db $02 - dw $98CB - db $41, $42 - db $02 - dw $98EB - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CB + db $41, $42 + db $02 + dw $98EB + db $43, $44 + db $00 ; terminator DiglettTileData_1a77e: ; 0x1a77e - dw LoadTileLists - db $04 - db $02 - dw $98CB - db $45, $46 - db $02 - dw $98EB - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CB + db $45, $46 + db $02 + dw $98EB + db $47, $48 + db $00 ; terminator DiglettTileData_1a78c: ; 0x1a78c - dw LoadTileLists - db $04 - db $02 - dw $990B - db $35, $36 - db $02 - dw $992B - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990B + db $35, $36 + db $02 + dw $992B + db $37, $38 + db $00 ; terminator DiglettTileData_1a79a: ; 0x1a79a - dw LoadTileLists - db $04 - db $02 - dw $990B - db $39, $3A - db $02 - dw $992B - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990B + db $39, $3A + db $02 + dw $992B + db $3B, $3C + db $00 ; terminator DiglettTileData_1a7a8: ; 0x1a7a8 - dw LoadTileLists - db $04 - db $02 - dw $990B - db $3D, $3E - db $02 - dw $992B - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990B + db $3D, $3E + db $02 + dw $992B + db $3F, $40 + db $00 ; terminator DiglettTileData_1a7b6: ; 0x1a7b6 - dw LoadTileLists - db $04 - db $02 - dw $990B - db $41, $42 - db $02 - dw $992B - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990B + db $41, $42 + db $02 + dw $992B + db $43, $44 + db $00 ; terminator DiglettTileData_1a7c4: ; 0x1a7c4 - dw LoadTileLists - db $04 - db $02 - dw $990B - db $45, $46 - db $02 - dw $992B - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990B + db $45, $46 + db $02 + dw $992B + db $47, $48 + db $00 ; terminator DiglettTileData_1a7d2: ; 0x1a7d2 - dw LoadTileLists - db $04 - db $02 - dw $994B - db $35, $36 - db $02 - dw $996B - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $994B + db $35, $36 + db $02 + dw $996B + db $37, $38 + db $00 ; terminator DiglettTileData_1a7e0: ; 0x1a7e0 - dw LoadTileLists - db $04 - db $02 - dw $994B - db $39, $3A - db $02 - dw $996B - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $994B + db $39, $3A + db $02 + dw $996B + db $3B, $3C + db $00 ; terminator DiglettTileData_1a7ee: ; 0x1a7ee - dw LoadTileLists - db $04 - db $02 - dw $994B - db $3D, $3E - db $02 - dw $996B - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $994B + db $3D, $3E + db $02 + dw $996B + db $3F, $40 + db $00 ; terminator DiglettTileData_1a7fc: ; 0x1a7fc - dw LoadTileLists - db $04 - db $02 - dw $994B - db $41, $42 - db $02 - dw $996B - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $994B + db $41, $42 + db $02 + dw $996B + db $43, $44 + db $00 ; terminator DiglettTileData_1a80a: ; 0x1a80a - dw LoadTileLists - db $04 - db $02 - dw $994B - db $45, $46 - db $02 - dw $996B - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $994B + db $45, $46 + db $02 + dw $996B + db $47, $48 + db $00 ; terminator DiglettTileData_1a818: ; 0x1a818 - dw LoadTileLists - db $04 - db $02 - dw $986D - db $35, $36 - db $02 - dw $988D - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $986D + db $35, $36 + db $02 + dw $988D + db $37, $38 + db $00 ; terminator DiglettTileData_1a826: ; 0x1a826 - dw LoadTileLists - db $04 - db $02 - dw $986D - db $39, $3A - db $02 - dw $988D - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $986D + db $39, $3A + db $02 + dw $988D + db $3B, $3C + db $00 ; terminator DiglettTileData_1a834: ; 0x1a834 - dw LoadTileLists - db $04 - db $02 - dw $986D - db $3D, $3E - db $02 - dw $988D - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $986D + db $3D, $3E + db $02 + dw $988D + db $3F, $40 + db $00 ; terminator DiglettTileData_1a842: ; 0x1a842 - dw LoadTileLists - db $04 - db $02 - dw $986D - db $41, $42 - db $02 - dw $988D - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $986D + db $41, $42 + db $02 + dw $988D + db $43, $44 + db $00 ; terminator DiglettTileData_1a850: ; 0x1a850 - dw LoadTileLists - db $04 - db $02 - dw $986D - db $45, $46 - db $02 - dw $988D - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $986D + db $45, $46 + db $02 + dw $988D + db $47, $48 + db $00 ; terminator DiglettTileData_1a85e: ; 0x1a85e - dw LoadTileLists - db $04 - db $02 - dw $98AD - db $35, $36 - db $02 - dw $98CD - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98AD + db $35, $36 + db $02 + dw $98CD + db $37, $38 + db $00 ; terminator DiglettTileData_1a86c: ; 0x1a86c - dw LoadTileLists - db $04 - db $02 - dw $98AD - db $39, $3A - db $02 - dw $98CD - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98AD + db $39, $3A + db $02 + dw $98CD + db $3B, $3C + db $00 ; terminator DiglettTileData_1a87a: ; 0x1a87a - dw LoadTileLists - db $04 - db $02 - dw $98AD - db $3D, $3E - db $02 - dw $98CD - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98AD + db $3D, $3E + db $02 + dw $98CD + db $3F, $40 + db $00 ; terminator DiglettTileData_1a888: ; 0x1a888 - dw LoadTileLists - db $04 - db $02 - dw $98AD - db $41, $42 - db $02 - dw $98CD - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98AD + db $41, $42 + db $02 + dw $98CD + db $43, $44 + db $00 ; terminator DiglettTileData_1a896: ; 0x1a896 - dw LoadTileLists - db $04 - db $02 - dw $98AD - db $45, $46 - db $02 - dw $98CD - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98AD + db $45, $46 + db $02 + dw $98CD + db $47, $48 + db $00 ; terminator DiglettTileData_1a8a4: ; 0x1a8a4 - dw LoadTileLists - db $04 - db $02 - dw $98ED - db $35, $36 - db $02 - dw $990D - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98ED + db $35, $36 + db $02 + dw $990D + db $37, $38 + db $00 ; terminator DiglettTileData_1a8b2: ; 0x1a8b2 - dw LoadTileLists - db $04 - db $02 - dw $98ED - db $39, $3A - db $02 - dw $990D - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98ED + db $39, $3A + db $02 + dw $990D + db $3B, $3C + db $00 ; terminator DiglettTileData_1a8c0: ; 0x1a8c0 - dw LoadTileLists - db $04 - db $02 - dw $98ED - db $3D, $3E - db $02 - dw $990D - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98ED + db $3D, $3E + db $02 + dw $990D + db $3F, $40 + db $00 ; terminator DiglettTileData_1a8ce: ; 0x1a8ce - dw LoadTileLists - db $04 - db $02 - dw $98ED - db $41, $42 - db $02 - dw $990D - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98ED + db $41, $42 + db $02 + dw $990D + db $43, $44 + db $00 ; terminator DiglettTileData_1a8dc: ; 0x1a8dc - dw LoadTileLists - db $04 - db $02 - dw $98ED - db $45, $46 - db $02 - dw $990D - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98ED + db $45, $46 + db $02 + dw $990D + db $47, $48 + db $00 ; terminator DiglettTileData_1a8ea: ; 0x1a8ea - dw LoadTileLists - db $04 - db $02 - dw $992D - db $35, $36 - db $02 - dw $994D - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $992D + db $35, $36 + db $02 + dw $994D + db $37, $38 + db $00 ; terminator DiglettTileData_1a8f8: ; 0x1a8f8 - dw LoadTileLists - db $04 - db $02 - dw $992D - db $39, $3A - db $02 - dw $994D - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $992D + db $39, $3A + db $02 + dw $994D + db $3B, $3C + db $00 ; terminator DiglettTileData_1a906: ; 0x1a906 - dw LoadTileLists - db $04 - db $02 - dw $992D - db $3D, $3E - db $02 - dw $994D - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $992D + db $3D, $3E + db $02 + dw $994D + db $3F, $40 + db $00 ; terminator DiglettTileData_1a914: ; 0x1a914 - dw LoadTileLists - db $04 - db $02 - dw $992D - db $41, $42 - db $02 - dw $994D - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $992D + db $41, $42 + db $02 + dw $994D + db $43, $44 + db $00 ; terminator DiglettTileData_1a922: ; 0x1a922 - dw LoadTileLists - db $04 - db $02 - dw $992D - db $45, $46 - db $02 - dw $994D - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $992D + db $45, $46 + db $02 + dw $994D + db $47, $48 + db $00 ; terminator DiglettTileData_1a930: ; 0x1a930 - dw LoadTileLists - db $04 - db $02 - dw $988F - db $35, $36 - db $02 - dw $98AF - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988F + db $35, $36 + db $02 + dw $98AF + db $37, $38 + db $00 ; terminator DiglettTileData_1a93e: ; 0x1a93e - dw LoadTileLists - db $04 - db $02 - dw $988F - db $39, $3A - db $02 - dw $98AF - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988F + db $39, $3A + db $02 + dw $98AF + db $3B, $3C + db $00 ; terminator DiglettTileData_1a94c: ; 0x1a94c - dw LoadTileLists - db $04 - db $02 - dw $988F - db $3D, $3E - db $02 - dw $98AF - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988F + db $3D, $3E + db $02 + dw $98AF + db $3F, $40 + db $00 ; terminator DiglettTileData_1a95a: ; 0x1a95a - dw LoadTileLists - db $04 - db $02 - dw $988F - db $41, $42 - db $02 - dw $98AF - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988F + db $41, $42 + db $02 + dw $98AF + db $43, $44 + db $00 ; terminator DiglettTileData_1a968: ; 0x1a968 - dw LoadTileLists - db $04 - db $02 - dw $988F - db $45, $46 - db $02 - dw $98AF - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $988F + db $45, $46 + db $02 + dw $98AF + db $47, $48 + db $00 ; terminator DiglettTileData_1a976: ; 0x1a976 - dw LoadTileLists - db $04 - db $02 - dw $98CF - db $35, $36 - db $02 - dw $98EF - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CF + db $35, $36 + db $02 + dw $98EF + db $37, $38 + db $00 ; terminator DiglettTileData_1a984: ; 0x1a984 - dw LoadTileLists - db $04 - db $02 - dw $98CF - db $39, $3A - db $02 - dw $98EF - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CF + db $39, $3A + db $02 + dw $98EF + db $3B, $3C + db $00 ; terminator DiglettTileData_1a992: ; 0x1a992 - dw LoadTileLists - db $04 - db $02 - dw $98CF - db $3D, $3E - db $02 - dw $98EF - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CF + db $3D, $3E + db $02 + dw $98EF + db $3F, $40 + db $00 ; terminator DiglettTileData_1a9a0: ; 0x1a9a0 - dw LoadTileLists - db $04 - db $02 - dw $98CF - db $41, $42 - db $02 - dw $98EF - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CF + db $41, $42 + db $02 + dw $98EF + db $43, $44 + db $00 ; terminator DiglettTileData_1a9ae: ; 0x1a9ae - dw LoadTileLists - db $04 - db $02 - dw $98CF - db $45, $46 - db $02 - dw $98EF - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98CF + db $45, $46 + db $02 + dw $98EF + db $47, $48 + db $00 ; terminator DiglettTileData_1a9bc: ; 0x1a9bc - dw LoadTileLists - db $04 - db $02 - dw $990F - db $35, $36 - db $02 - dw $992F - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990F + db $35, $36 + db $02 + dw $992F + db $37, $38 + db $00 ; terminator DiglettTileData_1a9ca: ; 0x1a9ca - dw LoadTileLists - db $04 - db $02 - dw $990F - db $39, $3A - db $02 - dw $992F - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990F + db $39, $3A + db $02 + dw $992F + db $3B, $3C + db $00 ; terminator DiglettTileData_1a9d8: ; 0x1a9d8 - dw LoadTileLists - db $04 - db $02 - dw $990F - db $3D, $3E - db $02 - dw $992F - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990F + db $3D, $3E + db $02 + dw $992F + db $3F, $40 + db $00 ; terminator DiglettTileData_1a9e6: ; 0x1a9e6 - dw LoadTileLists - db $04 - db $02 - dw $990F - db $41, $42 - db $02 - dw $992F - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990F + db $41, $42 + db $02 + dw $992F + db $43, $44 + db $00 ; terminator DiglettTileData_1a9f4: ; 0x1a9f4 - dw LoadTileLists - db $04 - db $02 - dw $990F - db $45, $46 - db $02 - dw $992F - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $990F + db $45, $46 + db $02 + dw $992F + db $47, $48 + db $00 ; terminator DiglettTileData_1aa02: ; 0x1aa02 - dw LoadTileLists - db $04 - db $02 - dw $9871 - db $35, $36 - db $02 - dw $9891 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9871 + db $35, $36 + db $02 + dw $9891 + db $37, $38 + db $00 ; terminator DiglettTileData_1aa10: ; 0x1aa10 - dw LoadTileLists - db $04 - db $02 - dw $9871 - db $39, $3A - db $02 - dw $9891 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9871 + db $39, $3A + db $02 + dw $9891 + db $3B, $3C + db $00 ; terminator DiglettTileData_1aa1e: ; 0x1aa1e - dw LoadTileLists - db $04 - db $02 - dw $9871 - db $3D, $3E - db $02 - dw $9891 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9871 + db $3D, $3E + db $02 + dw $9891 + db $3F, $40 + db $00 ; terminator DiglettTileData_1aa2c: ; 0x1aa2c - dw LoadTileLists - db $04 - db $02 - dw $9871 - db $41, $42 - db $02 - dw $9891 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9871 + db $41, $42 + db $02 + dw $9891 + db $43, $44 + db $00 ; terminator DiglettTileData_1aa3a: ; 0x1aa3a - dw LoadTileLists - db $04 - db $02 - dw $9871 - db $45, $46 - db $02 - dw $9891 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $9871 + db $45, $46 + db $02 + dw $9891 + db $47, $48 + db $00 ; terminator DiglettTileData_1aa48: ; 0x1aa48 - dw LoadTileLists - db $04 - db $02 - dw $98B1 - db $35, $36 - db $02 - dw $98D1 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98B1 + db $35, $36 + db $02 + dw $98D1 + db $37, $38 + db $00 ; terminator DiglettTileData_1aa56: ; 0x1aa56 - dw LoadTileLists - db $04 - db $02 - dw $98B1 - db $39, $3A - db $02 - dw $98D1 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98B1 + db $39, $3A + db $02 + dw $98D1 + db $3B, $3C + db $00 ; terminator DiglettTileData_1aa64: ; 0x1aa64 - dw LoadTileLists - db $04 - db $02 - dw $98B1 - db $3D, $3E - db $02 - dw $98D1 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98B1 + db $3D, $3E + db $02 + dw $98D1 + db $3F, $40 + db $00 ; terminator DiglettTileData_1aa72: ; 0x1aa72 - dw LoadTileLists - db $04 - db $02 - dw $98B1 - db $41, $42 - db $02 - dw $98D1 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98B1 + db $41, $42 + db $02 + dw $98D1 + db $43, $44 + db $00 ; terminator DiglettTileData_1aa80: ; 0x1aa80 - dw LoadTileLists - db $04 - db $02 - dw $98B1 - db $45, $46 - db $02 - dw $98D1 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98B1 + db $45, $46 + db $02 + dw $98D1 + db $47, $48 + db $00 ; terminator DiglettTileData_1aa8e: ; 0x1aa8e - dw LoadTileLists - db $04 - db $02 - dw $98F1 - db $35, $36 - db $02 - dw $9911 - db $37, $38 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98F1 + db $35, $36 + db $02 + dw $9911 + db $37, $38 + db $00 ; terminator DiglettTileData_1aa9c: ; 0x1aa9c - dw LoadTileLists - db $04 - db $02 - dw $98F1 - db $39, $3A - db $02 - dw $9911 - db $3B, $3C - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98F1 + db $39, $3A + db $02 + dw $9911 + db $3B, $3C + db $00 ; terminator DiglettTileData_1aaaa: ; 0x1aaaa - dw LoadTileLists - db $04 - db $02 - dw $98F1 - db $3D, $3E - db $02 - dw $9911 - db $3F, $40 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98F1 + db $3D, $3E + db $02 + dw $9911 + db $3F, $40 + db $00 ; terminator DiglettTileData_1aab8: ; 0x1aab8 - dw LoadTileLists - db $04 - db $02 - dw $98F1 - db $41, $42 - db $02 - dw $9911 - db $43, $44 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98F1 + db $41, $42 + db $02 + dw $9911 + db $43, $44 + db $00 ; terminator DiglettTileData_1aac6: ; 0x1aac6 - dw LoadTileLists - db $04 - db $02 - dw $98F1 - db $45, $46 - db $02 - dw $9911 - db $47, $48 - db $00 ; terminator + dw LoadTileLists + db $04 + db $02 + dw $98F1 + db $45, $46 + db $02 + dw $9911 + db $47, $48 + db $00 ; terminator diff --git a/data/evolution_lines.asm b/data/evolution_lines.asm index 8dc55c2..43f7308 100755 --- a/data/evolution_lines.asm +++ b/data/evolution_lines.asm @@ -1,81 +1,81 @@ EvolutionLineIds: ; 0x1161d ; Each byte corresponds to a mon in the PokeDex. - db EVOLINE_BULBASAUR, EVOLINE_BULBASAUR, EVOLINE_BULBASAUR - db EVOLINE_CHARMANDER, EVOLINE_CHARMANDER, EVOLINE_CHARMANDER - db EVOLINE_SQUIRTLE, EVOLINE_SQUIRTLE, EVOLINE_SQUIRTLE - db EVOLINE_CATERPIE, EVOLINE_CATERPIE, EVOLINE_CATERPIE - db EVOLINE_WEEDLE, EVOLINE_WEEDLE, EVOLINE_WEEDLE - db EVOLINE_PIDGEY, EVOLINE_PIDGEY, EVOLINE_PIDGEY - db EVOLINE_RATTATA, EVOLINE_RATTATA - db EVOLINE_SPEAROW, EVOLINE_SPEAROW - db EVOLINE_EKANS, EVOLINE_EKANS - db EVOLINE_PIKACHU, EVOLINE_PIKACHU - db EVOLINE_SANDSHREW, EVOLINE_SANDSHREW - db EVOLINE_NIDORAN_F, EVOLINE_NIDORAN_F, EVOLINE_NIDORAN_F - db EVOLINE_NIDORAN_M, EVOLINE_NIDORAN_M, EVOLINE_NIDORAN_M - db EVOLINE_CLEFAIRY, EVOLINE_CLEFAIRY - db EVOLINE_VULPIX, EVOLINE_VULPIX - db EVOLINE_JIGGLYPUFF, EVOLINE_JIGGLYPUFF - db EVOLINE_ZUBAT, EVOLINE_ZUBAT - db EVOLINE_ODDISH, EVOLINE_ODDISH, EVOLINE_ODDISH - db EVOLINE_PARAS,EVOLINE_PARAS - db EVOLINE_VENONAT,EVOLINE_VENONAT - db EVOLINE_DIGLETT, EVOLINE_DIGLETT - db EVOLINE_MEOWTH, EVOLINE_MEOWTH - db EVOLINE_PSYDUCK, EVOLINE_PSYDUCK - db EVOLINE_MANKEY, EVOLINE_MANKEY - db EVOLINE_GROWLITHE, EVOLINE_GROWLITHE - db EVOLINE_POLIWAG, EVOLINE_POLIWAG, EVOLINE_POLIWAG - db EVOLINE_ABRA, EVOLINE_ABRA, EVOLINE_ABRA - db EVOLINE_MACHOP, EVOLINE_MACHOP, EVOLINE_MACHOP - db EVOLINE_BELLSPROUT, EVOLINE_BELLSPROUT, EVOLINE_BELLSPROUT - db EVOLINE_TENTACOOL, EVOLINE_TENTACOOL - db EVOLINE_GEODUDE, EVOLINE_GEODUDE, EVOLINE_GEODUDE - db EVOLINE_PONYTA, EVOLINE_PONYTA - db EVOLINE_SLOWPOKE, EVOLINE_SLOWPOKE - db EVOLINE_MAGNEMITE, EVOLINE_MAGNEMITE - db EVOLINE_FARFETCH_D - db EVOLINE_DODUO, EVOLINE_DODUO - db EVOLINE_SEEL, EVOLINE_SEEL - db EVOLINE_GRIMER, EVOLINE_GRIMER - db EVOLINE_SHELLDER, EVOLINE_SHELLDER - db EVOLINE_GASTLY, EVOLINE_GASTLY, EVOLINE_GASTLY - db EVOLINE_ONIX - db EVOLINE_DROWZEE, EVOLINE_DROWZEE - db EVOLINE_KRABBY, EVOLINE_KRABBY - db EVOLINE_VOLTORB, EVOLINE_VOLTORB - db EVOLINE_EXEGGCUTE, EVOLINE_EXEGGCUTE - db EVOLINE_CUBONE, EVOLINE_CUBONE - db EVOLINE_HITMONLEE - db EVOLINE_HITMONCHAN - db EVOLINE_LICKITUNG - db EVOLINE_KOFFING, EVOLINE_KOFFING - db EVOLINE_RHYHORN, EVOLINE_RHYHORN - db EVOLINE_CHANSEY - db EVOLINE_TANGELA - db EVOLINE_KANGASKHAN - db EVOLINE_HORSEA, EVOLINE_HORSEA - db EVOLINE_GOLDEEN, EVOLINE_GOLDEEN - db EVOLINE_STARYU, EVOLINE_STARYU - db EVOLINE_MR_MIME - db EVOLINE_SCYTHER - db EVOLINE_JYNX - db EVOLINE_ELECTABUZZ - db EVOLINE_MAGMAR - db EVOLINE_PINSIR - db EVOLINE_TAUROS - db EVOLINE_MAGIKARP, EVOLINE_MAGIKARP - db EVOLINE_LAPRAS - db EVOLINE_DITTO - db EVOLINE_EEVEE, EVOLINE_EEVEE, EVOLINE_EEVEE, EVOLINE_EEVEE - db EVOLINE_PORYGON - db EVOLINE_OMANYTE, EVOLINE_OMANYTE - db EVOLINE_KABUTO, EVOLINE_KABUTO - db EVOLINE_AERODACTYL - db EVOLINE_SNORLAX - db EVOLINE_ARTICUNO - db EVOLINE_ZAPDOS - db EVOLINE_MOLTRES - db EVOLINE_DRATINI, EVOLINE_DRATINI, EVOLINE_DRATINI - db EVOLINE_MEWTWO - db EVOLINE_MEW + db EVOLINE_BULBASAUR, EVOLINE_BULBASAUR, EVOLINE_BULBASAUR + db EVOLINE_CHARMANDER, EVOLINE_CHARMANDER, EVOLINE_CHARMANDER + db EVOLINE_SQUIRTLE, EVOLINE_SQUIRTLE, EVOLINE_SQUIRTLE + db EVOLINE_CATERPIE, EVOLINE_CATERPIE, EVOLINE_CATERPIE + db EVOLINE_WEEDLE, EVOLINE_WEEDLE, EVOLINE_WEEDLE + db EVOLINE_PIDGEY, EVOLINE_PIDGEY, EVOLINE_PIDGEY + db EVOLINE_RATTATA, EVOLINE_RATTATA + db EVOLINE_SPEAROW, EVOLINE_SPEAROW + db EVOLINE_EKANS, EVOLINE_EKANS + db EVOLINE_PIKACHU, EVOLINE_PIKACHU + db EVOLINE_SANDSHREW, EVOLINE_SANDSHREW + db EVOLINE_NIDORAN_F, EVOLINE_NIDORAN_F, EVOLINE_NIDORAN_F + db EVOLINE_NIDORAN_M, EVOLINE_NIDORAN_M, EVOLINE_NIDORAN_M + db EVOLINE_CLEFAIRY, EVOLINE_CLEFAIRY + db EVOLINE_VULPIX, EVOLINE_VULPIX + db EVOLINE_JIGGLYPUFF, EVOLINE_JIGGLYPUFF + db EVOLINE_ZUBAT, EVOLINE_ZUBAT + db EVOLINE_ODDISH, EVOLINE_ODDISH, EVOLINE_ODDISH + db EVOLINE_PARAS,EVOLINE_PARAS + db EVOLINE_VENONAT,EVOLINE_VENONAT + db EVOLINE_DIGLETT, EVOLINE_DIGLETT + db EVOLINE_MEOWTH, EVOLINE_MEOWTH + db EVOLINE_PSYDUCK, EVOLINE_PSYDUCK + db EVOLINE_MANKEY, EVOLINE_MANKEY + db EVOLINE_GROWLITHE, EVOLINE_GROWLITHE + db EVOLINE_POLIWAG, EVOLINE_POLIWAG, EVOLINE_POLIWAG + db EVOLINE_ABRA, EVOLINE_ABRA, EVOLINE_ABRA + db EVOLINE_MACHOP, EVOLINE_MACHOP, EVOLINE_MACHOP + db EVOLINE_BELLSPROUT, EVOLINE_BELLSPROUT, EVOLINE_BELLSPROUT + db EVOLINE_TENTACOOL, EVOLINE_TENTACOOL + db EVOLINE_GEODUDE, EVOLINE_GEODUDE, EVOLINE_GEODUDE + db EVOLINE_PONYTA, EVOLINE_PONYTA + db EVOLINE_SLOWPOKE, EVOLINE_SLOWPOKE + db EVOLINE_MAGNEMITE, EVOLINE_MAGNEMITE + db EVOLINE_FARFETCH_D + db EVOLINE_DODUO, EVOLINE_DODUO + db EVOLINE_SEEL, EVOLINE_SEEL + db EVOLINE_GRIMER, EVOLINE_GRIMER + db EVOLINE_SHELLDER, EVOLINE_SHELLDER + db EVOLINE_GASTLY, EVOLINE_GASTLY, EVOLINE_GASTLY + db EVOLINE_ONIX + db EVOLINE_DROWZEE, EVOLINE_DROWZEE + db EVOLINE_KRABBY, EVOLINE_KRABBY + db EVOLINE_VOLTORB, EVOLINE_VOLTORB + db EVOLINE_EXEGGCUTE, EVOLINE_EXEGGCUTE + db EVOLINE_CUBONE, EVOLINE_CUBONE + db EVOLINE_HITMONLEE + db EVOLINE_HITMONCHAN + db EVOLINE_LICKITUNG + db EVOLINE_KOFFING, EVOLINE_KOFFING + db EVOLINE_RHYHORN, EVOLINE_RHYHORN + db EVOLINE_CHANSEY + db EVOLINE_TANGELA + db EVOLINE_KANGASKHAN + db EVOLINE_HORSEA, EVOLINE_HORSEA + db EVOLINE_GOLDEEN, EVOLINE_GOLDEEN + db EVOLINE_STARYU, EVOLINE_STARYU + db EVOLINE_MR_MIME + db EVOLINE_SCYTHER + db EVOLINE_JYNX + db EVOLINE_ELECTABUZZ + db EVOLINE_MAGMAR + db EVOLINE_PINSIR + db EVOLINE_TAUROS + db EVOLINE_MAGIKARP, EVOLINE_MAGIKARP + db EVOLINE_LAPRAS + db EVOLINE_DITTO + db EVOLINE_EEVEE, EVOLINE_EEVEE, EVOLINE_EEVEE, EVOLINE_EEVEE + db EVOLINE_PORYGON + db EVOLINE_OMANYTE, EVOLINE_OMANYTE + db EVOLINE_KABUTO, EVOLINE_KABUTO + db EVOLINE_AERODACTYL + db EVOLINE_SNORLAX + db EVOLINE_ARTICUNO + db EVOLINE_ZAPDOS + db EVOLINE_MOLTRES + db EVOLINE_DRATINI, EVOLINE_DRATINI, EVOLINE_DRATINI + db EVOLINE_MEWTWO + db EVOLINE_MEW diff --git a/data/mon_names.asm b/data/mon_names.asm index 53926e3..aaa5d2c 100755 --- a/data/mon_names.asm +++ b/data/mon_names.asm @@ -1,154 +1,154 @@ PokemonNames: ; 0x11a4e ; The first byte of each entry is the symbol displayed to the left of the mon's ; name in the evolution menu. Fully-evolved pokemon have an asterisk next to their names. - db " BULBASAUR@ " - db " IVYSAUR@ " - db "*VENUSAUR@ " - db " CHARMANDER@ " - db " CHARMELEON@ " - db "*CHARIZARD@ " - db " SQUIRTLE@ " - db " WARTORTLE@ " - db "*BLASTOISE@ " - db " CATERPIE@ " - db " METAPOD@ " - db "*BUTTERFREE@ " - db " WEEDLE@ " - db " KAKUNA@ " - db "*BEEDRILL@ " - db " PIDGEY@ " - db " PIDGEOTTO@ " - db "*PIDGEOT@ " - db " RATTATA@ " - db "*RATICATE@ " - db " SPEAROW@ " - db "*FEAROW@ " - db " EKANS@ " - db "*ARBOK@ " - db " PIKACHU@ " - db "*RAICHU@ " - db " SANDSHREW@ " - db "*SANDSLASH@ " - db " NIDORAN♂@ " - db " NIDORINA@ " - db "*NIDOQUEEN@ " - db " NIDORAN♀@ " - db " NIDORINO@ " - db "*NIDOKING@ " - db " CLEFAIRY@ " - db "*CLEFABLE@ " - db " VULPIX@ " - db "*NINETALES@ " - db " JIGGLYPUFF@ " - db "*WIGGLYTUFF@ " - db " ZUBAT@ " - db "*GOLBAT@ " - db " ODDISH@ " - db " GLOOM@ " - db "*VILEPLUME@ " - db " PARAS@ " - db "*PARASECT@ " - db " VENONAT@ " - db "*VENOMOTH@ " - db " DIGLETT@ " - db "*DUGTRIO@ " - db " MEOWTH@ " - db "*PERSIAN@ " - db " PSYDUCK@ " - db "*GOLDUCK@ " - db " MANKEY@ " - db "*PRIMEAPE@ " - db " GROWLITHE@ " - db "*ARCANINE@ " - db " POLIWAG@ " - db " POLIWHIRL@ " - db "*POLIWRATH@ " - db " ABRA@ " - db " KADABRA@ " - db "*ALAKAZAM@ " - db " MACHOP@ " - db " MACHOKE@ " - db "*MACHAMP@ " - db " BELLSPROUT@ " - db " WEEPINBELL@ " - db "*VICTREEBEL@ " - db " TENTACOOL@ " - db "*TENTACRUEL@ " - db " GEODUDE@ " - db " GRAVELER@ " - db "*GOLEM@ " - db " PONYTA@ " - db "*RAPIDASH@ " - db " SLOWPOKE@ " - db "*SLOWBRO@ " - db " MAGNEMITE@ " - db "*MAGNETON@ " - db "*FARFETCH'D@ " - db " DODUO@ " - db "*DODRIO@ " - db " SEEL@ " - db "*DEWGONG@ " - db " GRIMER@ " - db "*MUK@ " - db " SHELLDER@ " - db "*CLOYSTER@ " - db " GASTLY@ " - db " HAUNTER@ " - db "*GENGAR@ " - db "*ONIX@ " - db " DROWZEE@ " - db "*HYPNO@ " - db " KRABBY@ " - db "*KINGLER@ " - db " VOLTORB@ " - db "*ELECTRODE@ " - db " EXEGGCUTE@ " - db "*EXEGGUTOR@ " - db " CUBONE@ " - db "*MAROWAK@ " - db "*HITMONLEE@ " - db "*HITMONCHAN@ " - db "*LICKITUNG@ " - db " KOFFING@ " - db "*WEEZING@ " - db " RHYHORN@ " - db "*RHYDON@ " - db "*CHANSEY@ " - db "*TANGELA@ " - db "*KANGASKHAN@ " - db " HORSEA@ " - db "*SEADRA@ " - db " GOLDEEN@ " - db "*SEAKING@ " - db " STARYU@ " - db "*STARMIE@ " - db "*MR.MIME@ " - db "*SCYTHER@ " - db "*JYNX@ " - db "*ELECTABUZZ@ " - db "*MAGMAR@ " - db "*PINSIR@ " - db "*TAUROS@ " - db " MAGIKARP@ " - db "*GYARADOS@ " - db "*LAPRAS@ " - db "*DITTO@ " - db " EEVEE@ " - db "*VAPOREON@ " - db "*JOLTEON@ " - db "*FLAREON@ " - db "*PORYGON@ " - db " OMANYTE@ " - db "*OMASTAR@ " - db " KABUTO@ " - db "*KABUTOPS@ " - db "*AERODACTYL@ " - db "*SNORLAX@ " - db "*ARTICUNO@ " - db "*ZAPDOS@ " - db "*MOLTRES@ " - db " DRATINI@ " - db " DRAGONAIR@ " - db "*DRAGONITE@ " - db "*MEWTWO@ " - db "*MEW@ " + db " BULBASAUR@ " + db " IVYSAUR@ " + db "*VENUSAUR@ " + db " CHARMANDER@ " + db " CHARMELEON@ " + db "*CHARIZARD@ " + db " SQUIRTLE@ " + db " WARTORTLE@ " + db "*BLASTOISE@ " + db " CATERPIE@ " + db " METAPOD@ " + db "*BUTTERFREE@ " + db " WEEDLE@ " + db " KAKUNA@ " + db "*BEEDRILL@ " + db " PIDGEY@ " + db " PIDGEOTTO@ " + db "*PIDGEOT@ " + db " RATTATA@ " + db "*RATICATE@ " + db " SPEAROW@ " + db "*FEAROW@ " + db " EKANS@ " + db "*ARBOK@ " + db " PIKACHU@ " + db "*RAICHU@ " + db " SANDSHREW@ " + db "*SANDSLASH@ " + db " NIDORAN♂@ " + db " NIDORINA@ " + db "*NIDOQUEEN@ " + db " NIDORAN♀@ " + db " NIDORINO@ " + db "*NIDOKING@ " + db " CLEFAIRY@ " + db "*CLEFABLE@ " + db " VULPIX@ " + db "*NINETALES@ " + db " JIGGLYPUFF@ " + db "*WIGGLYTUFF@ " + db " ZUBAT@ " + db "*GOLBAT@ " + db " ODDISH@ " + db " GLOOM@ " + db "*VILEPLUME@ " + db " PARAS@ " + db "*PARASECT@ " + db " VENONAT@ " + db "*VENOMOTH@ " + db " DIGLETT@ " + db "*DUGTRIO@ " + db " MEOWTH@ " + db "*PERSIAN@ " + db " PSYDUCK@ " + db "*GOLDUCK@ " + db " MANKEY@ " + db "*PRIMEAPE@ " + db " GROWLITHE@ " + db "*ARCANINE@ " + db " POLIWAG@ " + db " POLIWHIRL@ " + db "*POLIWRATH@ " + db " ABRA@ " + db " KADABRA@ " + db "*ALAKAZAM@ " + db " MACHOP@ " + db " MACHOKE@ " + db "*MACHAMP@ " + db " BELLSPROUT@ " + db " WEEPINBELL@ " + db "*VICTREEBEL@ " + db " TENTACOOL@ " + db "*TENTACRUEL@ " + db " GEODUDE@ " + db " GRAVELER@ " + db "*GOLEM@ " + db " PONYTA@ " + db "*RAPIDASH@ " + db " SLOWPOKE@ " + db "*SLOWBRO@ " + db " MAGNEMITE@ " + db "*MAGNETON@ " + db "*FARFETCH'D@ " + db " DODUO@ " + db "*DODRIO@ " + db " SEEL@ " + db "*DEWGONG@ " + db " GRIMER@ " + db "*MUK@ " + db " SHELLDER@ " + db "*CLOYSTER@ " + db " GASTLY@ " + db " HAUNTER@ " + db "*GENGAR@ " + db "*ONIX@ " + db " DROWZEE@ " + db "*HYPNO@ " + db " KRABBY@ " + db "*KINGLER@ " + db " VOLTORB@ " + db "*ELECTRODE@ " + db " EXEGGCUTE@ " + db "*EXEGGUTOR@ " + db " CUBONE@ " + db "*MAROWAK@ " + db "*HITMONLEE@ " + db "*HITMONCHAN@ " + db "*LICKITUNG@ " + db " KOFFING@ " + db "*WEEZING@ " + db " RHYHORN@ " + db "*RHYDON@ " + db "*CHANSEY@ " + db "*TANGELA@ " + db "*KANGASKHAN@ " + db " HORSEA@ " + db "*SEADRA@ " + db " GOLDEEN@ " + db "*SEAKING@ " + db " STARYU@ " + db "*STARMIE@ " + db "*MR.MIME@ " + db "*SCYTHER@ " + db "*JYNX@ " + db "*ELECTABUZZ@ " + db "*MAGMAR@ " + db "*PINSIR@ " + db "*TAUROS@ " + db " MAGIKARP@ " + db "*GYARADOS@ " + db "*LAPRAS@ " + db "*DITTO@ " + db " EEVEE@ " + db "*VAPOREON@ " + db "*JOLTEON@ " + db "*FLAREON@ " + db "*PORYGON@ " + db " OMANYTE@ " + db "*OMASTAR@ " + db " KABUTO@ " + db "*KABUTOPS@ " + db "*AERODACTYL@ " + db "*SNORLAX@ " + db "*ARTICUNO@ " + db "*ZAPDOS@ " + db "*MOLTRES@ " + db " DRATINI@ " + db " DRAGONAIR@ " + db "*DRAGONITE@ " + db "*MEWTWO@ " + db "*MEW@ " diff --git a/data/red_wild_mons.asm b/data/red_wild_mons.asm index 60a4574..b9533ac 100755 --- a/data/red_wild_mons.asm +++ b/data/red_wild_mons.asm @@ -1,434 +1,434 @@ RedStageWildMons: ; 0x112cc RedStagePalletTownWildMons: ; 0x112cc - db BULBASAUR - db CHARMANDER - db CHARMANDER - db CHARMANDER - db CHARMANDER - db CHARMANDER - db CHARMANDER - db PIDGEY - db PIDGEY - db PIDGEY - db RATTATA - db RATTATA - db RATTATA - db NIDORAN_M - db POLIWAG - db TENTACOOL + db BULBASAUR + db CHARMANDER + db CHARMANDER + db CHARMANDER + db CHARMANDER + db CHARMANDER + db CHARMANDER + db PIDGEY + db PIDGEY + db PIDGEY + db RATTATA + db RATTATA + db RATTATA + db NIDORAN_M + db POLIWAG + db TENTACOOL RedStagePalletTownWildMonsRare: ; 0x112dc - db BULBASAUR - db BULBASAUR - db BULBASAUR - db CHARMANDER - db PIDGEY - db RATTATA - db NIDORAN_M - db NIDORAN_M - db NIDORAN_M - db POLIWAG - db POLIWAG - db POLIWAG - db POLIWAG - db TENTACOOL - db TENTACOOL - db TENTACOOL + db BULBASAUR + db BULBASAUR + db BULBASAUR + db CHARMANDER + db PIDGEY + db RATTATA + db NIDORAN_M + db NIDORAN_M + db NIDORAN_M + db POLIWAG + db POLIWAG + db POLIWAG + db POLIWAG + db TENTACOOL + db TENTACOOL + db TENTACOOL RedStageViridianForestWildMons: ; 0x112ec - db WEEDLE - db WEEDLE - db WEEDLE - db WEEDLE - db WEEDLE - db PIDGEY - db PIDGEY - db PIDGEY - db PIDGEY - db PIDGEY - db RATTATA - db RATTATA - db RATTATA - db RATTATA - db RATTATA - db PIKACHU + db WEEDLE + db WEEDLE + db WEEDLE + db WEEDLE + db WEEDLE + db PIDGEY + db PIDGEY + db PIDGEY + db PIDGEY + db PIDGEY + db RATTATA + db RATTATA + db RATTATA + db RATTATA + db RATTATA + db PIKACHU RedStageViridianForestWildMonsRare: ; 0x112fc - db CATERPIE - db CATERPIE - db WEEDLE - db WEEDLE - db WEEDLE - db PIDGEY - db PIDGEY - db RATTATA - db RATTATA - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU - db PIKACHU + db CATERPIE + db CATERPIE + db WEEDLE + db WEEDLE + db WEEDLE + db PIDGEY + db PIDGEY + db RATTATA + db RATTATA + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU + db PIKACHU RedStagePewterCityWildMons: ; 0x1130c - db PIDGEY - db PIDGEY - db SPEAROW - db SPEAROW - db SPEAROW - db SPEAROW - db SPEAROW - db SPEAROW - db EKANS - db JIGGLYPUFF - db JIGGLYPUFF - db JIGGLYPUFF - db JIGGLYPUFF - db JIGGLYPUFF - db MAGIKARP - db MAGIKARP + db PIDGEY + db PIDGEY + db SPEAROW + db SPEAROW + db SPEAROW + db SPEAROW + db SPEAROW + db SPEAROW + db EKANS + db JIGGLYPUFF + db JIGGLYPUFF + db JIGGLYPUFF + db JIGGLYPUFF + db JIGGLYPUFF + db MAGIKARP + db MAGIKARP RedStagePewterCityWildMonsRare: ; 0x1131c - db PIDGEY - db PIDGEY - db SPEAROW - db SPEAROW - db SPEAROW - db EKANS - db EKANS - db EKANS - db EKANS - db JIGGLYPUFF - db JIGGLYPUFF - db JIGGLYPUFF - db MAGIKARP - db MAGIKARP - db MAGIKARP - db MAGIKARP + db PIDGEY + db PIDGEY + db SPEAROW + db SPEAROW + db SPEAROW + db EKANS + db EKANS + db EKANS + db EKANS + db JIGGLYPUFF + db JIGGLYPUFF + db JIGGLYPUFF + db MAGIKARP + db MAGIKARP + db MAGIKARP + db MAGIKARP RedStageCeruleanCityWildMons: ; 0x1132c - db WEEDLE - db WEEDLE - db PIDGEY - db ODDISH - db ODDISH - db ODDISH - db ODDISH - db ODDISH - db PSYDUCK - db MANKEY - db MANKEY - db MANKEY - db ABRA - db ABRA - db KRABBY - db GOLDEEN + db WEEDLE + db WEEDLE + db PIDGEY + db ODDISH + db ODDISH + db ODDISH + db ODDISH + db ODDISH + db PSYDUCK + db MANKEY + db MANKEY + db MANKEY + db ABRA + db ABRA + db KRABBY + db GOLDEEN RedStageCeruleanCityWildMonsRare: ; 0x1133c - db CATERPIE - db NIDORAN_M - db ODDISH - db PSYDUCK - db PSYDUCK - db MANKEY - db MANKEY - db ABRA - db ABRA - db ABRA - db KRABBY - db GOLDEEN - db GOLDEEN - db JYNX - db JYNX - db JYNX + db CATERPIE + db NIDORAN_M + db ODDISH + db PSYDUCK + db PSYDUCK + db MANKEY + db MANKEY + db ABRA + db ABRA + db ABRA + db KRABBY + db GOLDEEN + db GOLDEEN + db JYNX + db JYNX + db JYNX RedStageVermilionSeasideWildMons: ; 0x1134c - db PIDGEY - db SPEAROW - db EKANS - db EKANS - db ODDISH - db ODDISH - db MANKEY - db MANKEY - db SHELLDER - db SHELLDER - db SHELLDER - db DROWZEE - db DROWZEE - db KRABBY - db KRABBY - db KRABBY + db PIDGEY + db SPEAROW + db EKANS + db EKANS + db ODDISH + db ODDISH + db MANKEY + db MANKEY + db SHELLDER + db SHELLDER + db SHELLDER + db DROWZEE + db DROWZEE + db KRABBY + db KRABBY + db KRABBY RedStageVermilionSeasideWildMonsRare: ; 0x1135c - db EKANS - db EKANS - db EKANS - db EKANS - db ODDISH - db MANKEY - db FARFETCH_D - db FARFETCH_D - db FARFETCH_D - db FARFETCH_D - db SHELLDER - db SHELLDER - db DROWZEE - db DROWZEE - db KRABBY - db KRABBY + db EKANS + db EKANS + db EKANS + db EKANS + db ODDISH + db MANKEY + db FARFETCH_D + db FARFETCH_D + db FARFETCH_D + db FARFETCH_D + db SHELLDER + db SHELLDER + db DROWZEE + db DROWZEE + db KRABBY + db KRABBY RedStageRockMountainWildMons: ; 0x1136c - db RATTATA - db SPEAROW - db EKANS - db EKANS - db EKANS - db ZUBAT - db DIGLETT - db DIGLETT - db DIGLETT - db MACHOP - db GEODUDE - db SLOWPOKE - db ONIX - db VOLTORB - db VOLTORB - db VOLTORB + db RATTATA + db SPEAROW + db EKANS + db EKANS + db EKANS + db ZUBAT + db DIGLETT + db DIGLETT + db DIGLETT + db MACHOP + db GEODUDE + db SLOWPOKE + db ONIX + db VOLTORB + db VOLTORB + db VOLTORB RedStageRockMountainWildMonsRare: ; 0x1137c - db ZUBAT - db ZUBAT - db DIGLETT - db MACHOP - db MACHOP - db GEODUDE - db GEODUDE - db SLOWPOKE - db SLOWPOKE - db ONIX - db ONIX - db VOLTORB - db VOLTORB - db MR_MIME - db MR_MIME - db MR_MIME + db ZUBAT + db ZUBAT + db DIGLETT + db MACHOP + db MACHOP + db GEODUDE + db GEODUDE + db SLOWPOKE + db SLOWPOKE + db ONIX + db ONIX + db VOLTORB + db VOLTORB + db MR_MIME + db MR_MIME + db MR_MIME RedStageLavenderTownWildMons: ; 0x1138c - db PIDGEY - db PIDGEY - db EKANS - db EKANS - db MANKEY - db MANKEY - db GROWLITHE - db GROWLITHE - db MAGNEMITE - db MAGNEMITE - db GASTLY - db GASTLY - db GASTLY - db GASTLY - db GASTLY - db CUBONE + db PIDGEY + db PIDGEY + db EKANS + db EKANS + db MANKEY + db MANKEY + db GROWLITHE + db GROWLITHE + db MAGNEMITE + db MAGNEMITE + db GASTLY + db GASTLY + db GASTLY + db GASTLY + db GASTLY + db CUBONE RedStageLavenderTownWildMonsRare: ; 0x1139c - db EKANS - db MANKEY - db GROWLITHE - db MAGNEMITE - db MAGNEMITE - db GASTLY - db GASTLY - db CUBONE - db CUBONE - db CUBONE - db ELECTABUZZ - db ELECTABUZZ - db ELECTABUZZ - db ZAPDOS - db ZAPDOS - db ZAPDOS + db EKANS + db MANKEY + db GROWLITHE + db MAGNEMITE + db MAGNEMITE + db GASTLY + db GASTLY + db CUBONE + db CUBONE + db CUBONE + db ELECTABUZZ + db ELECTABUZZ + db ELECTABUZZ + db ZAPDOS + db ZAPDOS + db ZAPDOS RedStageCyclingRoadWildMons: ; 0x113ac - db RATTATA - db RATTATA - db SPEAROW - db SPEAROW - db TENTACOOL - db TENTACOOL - db DODUO - db DODUO - db DODUO - db KRABBY - db KRABBY - db LICKITUNG - db GOLDEEN - db GOLDEEN - db MAGIKARP - db MAGIKARP + db RATTATA + db RATTATA + db SPEAROW + db SPEAROW + db TENTACOOL + db TENTACOOL + db DODUO + db DODUO + db DODUO + db KRABBY + db KRABBY + db LICKITUNG + db GOLDEEN + db GOLDEEN + db MAGIKARP + db MAGIKARP RedStageCyclingRoadWildMonsRare: ; 0x113bc - db TENTACOOL - db DODUO - db DODUO - db DODUO - db DODUO - db DODUO - db KRABBY - db LICKITUNG - db LICKITUNG - db LICKITUNG - db LICKITUNG - db GOLDEEN - db MAGIKARP - db SNORLAX - db SNORLAX - db SNORLAX + db TENTACOOL + db DODUO + db DODUO + db DODUO + db DODUO + db DODUO + db KRABBY + db LICKITUNG + db LICKITUNG + db LICKITUNG + db LICKITUNG + db GOLDEEN + db MAGIKARP + db SNORLAX + db SNORLAX + db SNORLAX RedStageSafariZoneWildMons: ; 0x113cc - db NIDORAN_M - db NIDORAN_M - db NIDORAN_M - db NIDORAN_M - db PARAS - db PARAS - db PARAS - db PARAS - db DODUO - db DODUO - db DODUO - db DODUO - db RHYHORN - db RHYHORN - db RHYHORN - db RHYHORN + db NIDORAN_M + db NIDORAN_M + db NIDORAN_M + db NIDORAN_M + db PARAS + db PARAS + db PARAS + db PARAS + db DODUO + db DODUO + db DODUO + db DODUO + db RHYHORN + db RHYHORN + db RHYHORN + db RHYHORN RedStageSafariZoneWildMonsRare: ; 0x113dc - db NIDORAN_M - db NIDORAN_M - db PARAS - db PARAS - db RHYHORN - db RHYHORN - db CHANSEY - db CHANSEY - db CHANSEY - db CHANSEY - db SCYTHER - db SCYTHER - db TAUROS - db TAUROS - db DRATINI - db DRATINI + db NIDORAN_M + db NIDORAN_M + db PARAS + db PARAS + db RHYHORN + db RHYHORN + db CHANSEY + db CHANSEY + db CHANSEY + db CHANSEY + db SCYTHER + db SCYTHER + db TAUROS + db TAUROS + db DRATINI + db DRATINI RedStageSeafoamIslandsWildMons: ; 0x113ec - db ZUBAT - db PSYDUCK - db TENTACOOL - db SLOWPOKE - db SEEL - db SHELLDER - db KRABBY - db HORSEA - db HORSEA - db HORSEA - db HORSEA - db GOLDEEN - db STARYU - db STARYU - db STARYU - db STARYU + db ZUBAT + db PSYDUCK + db TENTACOOL + db SLOWPOKE + db SEEL + db SHELLDER + db KRABBY + db HORSEA + db HORSEA + db HORSEA + db HORSEA + db GOLDEEN + db STARYU + db STARYU + db STARYU + db STARYU RedStageSeafoamIslandsWildMonsRare: ; 0x113fc - db SEEL - db SEEL - db SEEL - db SEEL - db SEEL - db GOLDEEN - db GOLDEEN - db GOLDEEN - db GOLDEEN - db STARYU - db STARYU - db STARYU - db STARYU - db ARTICUNO - db ARTICUNO - db ARTICUNO + db SEEL + db SEEL + db SEEL + db SEEL + db SEEL + db GOLDEEN + db GOLDEEN + db GOLDEEN + db GOLDEEN + db STARYU + db STARYU + db STARYU + db STARYU + db ARTICUNO + db ARTICUNO + db ARTICUNO RedStageCinnabarIslandWildMons: ; 0x1140c - db GROWLITHE - db GROWLITHE - db GROWLITHE - db GROWLITHE - db PONYTA - db PONYTA - db PONYTA - db PONYTA - db GRIMER - db GRIMER - db KOFFING - db KOFFING - db KOFFING - db KOFFING - db TANGELA - db TANGELA + db GROWLITHE + db GROWLITHE + db GROWLITHE + db GROWLITHE + db PONYTA + db PONYTA + db PONYTA + db PONYTA + db GRIMER + db GRIMER + db KOFFING + db KOFFING + db KOFFING + db KOFFING + db TANGELA + db TANGELA RedStageCinnabarIslandWildMonsRare: ; 0x1141c - db GROWLITHE - db GROWLITHE - db PONYTA - db PONYTA - db GRIMER - db KOFFING - db KOFFING - db TANGELA - db TANGELA - db TANGELA - db OMANYTE - db OMANYTE - db OMANYTE - db KABUTO - db KABUTO - db KABUTO + db GROWLITHE + db GROWLITHE + db PONYTA + db PONYTA + db GRIMER + db KOFFING + db KOFFING + db TANGELA + db TANGELA + db TANGELA + db OMANYTE + db OMANYTE + db OMANYTE + db KABUTO + db KABUTO + db KABUTO RedStageIndigoPlateauWildMons: ; 0x1142c - db SPEAROW - db EKANS - db ZUBAT - db ZUBAT - db MACHOP - db MACHOP - db MACHOP - db GEODUDE - db GEODUDE - db GEODUDE - db ONIX - db ONIX - db ONIX - db DITTO - db DITTO - db DITTO + db SPEAROW + db EKANS + db ZUBAT + db ZUBAT + db MACHOP + db MACHOP + db MACHOP + db GEODUDE + db GEODUDE + db GEODUDE + db ONIX + db ONIX + db ONIX + db DITTO + db DITTO + db DITTO RedStageIndigoPlateauWildMonsRare: ; 0x1143c - db SPEAROW - db EKANS - db ZUBAT - db MACHOP - db GEODUDE - db ONIX - db DITTO - db DITTO - db DITTO - db DITTO - db MOLTRES - db MOLTRES - db MOLTRES - db MEWTWO - db MEWTWO - db MEWTWO + db SPEAROW + db EKANS + db ZUBAT + db MACHOP + db GEODUDE + db ONIX + db DITTO + db DITTO + db DITTO + db DITTO + db MOLTRES + db MOLTRES + db MOLTRES + db MEWTWO + db MEWTWO + db MEWTWO - db MEW + db MEW @@ -1,18 +1,18 @@ hPushOAM EQU $FF80 hJoypadState EQU $FF98 ; current state of buttons. See joy_constants.asm for which bits - ; correspond to which buttons. + ; correspond to which buttons. hNewlyPressedButtons EQU $FF99 ; buttons that were pressed in the current frame. hPressedButtons EQU $FF9A ; buttons that were pressed last frame and current frame(?) hPrevPreviousJoypadState EQU $FF9B ; joypad state from two frames ago. See joy_constants.asm for - ; which bits correspond to which buttons. (need a better name for this...) + ; which bits correspond to which buttons. (need a better name for this...) hPreviousJoypadState EQU $FF9C ; prevoius frame's joypad state. See joy_constants.asm for - ; which bits correspond to which buttons. + ; which bits correspond to which buttons. hBoardYShift EQU $FFA0 ; Vertical pixel offset of the board. For example, the board is shifted - ; by small amounts when "tilt up" is used. + ; by small amounts when "tilt up" is used. hBoardXShift EQU $FFA1 ; Horizontal pixel offset of the board. For example, the board is shifted - ; $20 pixels to the right when launching the ball at the start of a round. + ; $20 pixels to the right when launching the ball at the start of a round. hFlipperYCollisionAttribute EQU $FFBF ; Vertical collision attribute for when ball collides with a flipper. @@ -1,5 +1,8 @@ INCLUDE "macros/sound.asm" +AdvanceFrame EQUS "$10" +JumpTable EQUS "$18" + dex_text EQUS "db " ; Start beginning of pokedex description dex_line EQUS "db $0d," ; Start new line in pokedex description dex_end EQUS "db $00" ; Terminate the pokedex description @@ -38,16 +41,30 @@ bigdw: MACRO ; big-endian word dx 2, \1 ENDM +farcall: MACRO + ld a, BANK(\1) + ld hl, \1 + call BankSwitch + ENDM + +callba EQUS "farcall" + +callab: MACRO + ld hl, \1 + ld a, BANK(\1) + call BankSwitch + ENDM + bigBCD6: MACRO ; There is probably a better name for this macro. ; It write a BCD in big-endian form. - dn ((\1) / 10) % 10, (\1) % 10 - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 - dn ((\1) / 10000000) % 10, ((\1) / 1000000) % 10 - dn ((\1) / 1000000000) % 10, ((\1) / 100000000) % 10 - dn ((\1) / 100000000000) % 10, ((\1) / 10000000000) % 10 - ENDM + dn ((\1) / 10) % 10, (\1) % 10 + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 + dn ((\1) / 10000000) % 10, ((\1) / 1000000) % 10 + dn ((\1) / 1000000000) % 10, ((\1) / 100000000) % 10 + dn ((\1) / 100000000000) % 10, ((\1) / 10000000000) % 10 + ENDM ; Constant enumeration is useful for mons, maps, etc. const_def: MACRO @@ -7,7 +7,7 @@ SECTION "rst 00", ROM0 [$00] jp Entry SECTION "rst 10", ROM0 [$10] - jp Func_468 + jp DelayFrame SECTION "rst 18", ROM0 [$18] jp JumpToFuncInTable @@ -15,20 +15,20 @@ SECTION "rst 18", ROM0 [$18] SECTION "rst 20", ROM0 [$20] jp Func_486 -SECTION "rst 40", ROM0 [$40] - jp Func_2f2 +SECTION "VBlankInt", ROM0 [$40] + jp VBlank -SECTION "rst 48", ROM0 [$48] - jp Func_3ec +SECTION "HBlankInt", ROM0 [$48] + jp LCD -SECTION "rst 50", ROM0 [$50] - jp Func_418 +SECTION "TimerInt", ROM0 [$50] + jp Timer -SECTION "rst 58", ROM0 [$58] - jp Func_445 +SECTION "SerialInt", ROM0 [$58] + jp Serial -SECTION "rst 60", ROM0 [$60] - jp Func_467 +SECTION "JoypadInt", ROM0 [$60] + jp Joypad SECTION "Entry", ROM0 [$100] @@ -154,7 +154,7 @@ Start: ; 0x150 call Func_97a xor a ld [$daa3], a - ld a, Bank(Func_1ffc) + ld a, BANK(Func_1ffc) ld hl, Func_1ffc call BankSwitchSimple Func_23b: ; 0x23b @@ -173,7 +173,7 @@ Func_23b: ; 0x23b dr $24e, $2f2 -Func_2f2: ; 0x2f2 +VBlank: ; 0x2f2 push af push bc push de @@ -303,7 +303,7 @@ Func_2f2: ; 0x2f2 dr $3c3, $3ec -Func_3ec: ; 0x3ec +LCD: ; 0x3ec push af push bc push de @@ -338,7 +338,7 @@ PointerTable_408: ; 0x408 dw Func_10a4 dw Func_10a7 -Func_418: ; 0x418 +Timer: ; 0x418 ei push af push bc @@ -368,7 +368,7 @@ Func_418: ; 0x418 pop af reti -Func_445: ; 0x445 +Serial: ; 0x445 push af push bc push de @@ -393,10 +393,10 @@ Data_45d: Data_462: db $64, $16, $66, $04, $c9 -Func_467: ; 0x467 +Joypad: ; 0x467 reti -Func_468: ; 0x468 +DelayFrame: ; 0x468 ld a, [rLCDC] bit 7, a ret z @@ -411,7 +411,7 @@ Func_468: ; 0x468 JumpToFuncInTable: ; 0x477 ; Jumps to a function in the pointer table immediately following -; a "rst $18" call. Function must be in the same Bank as the pointer table. +; a "rst JumpTable" call. Function must be in the same Bank as the pointer table. ; input: a = index of function in table sla a pop hl @@ -1327,7 +1327,7 @@ Func_926: ; 0x926 Func_93f: ; 0x93f push bc - rst $10 + rst AdvanceFrame pop bc dec bc ld a, c @@ -3595,7 +3595,7 @@ Func_1a89: ; 0x1a89 ld a, [hNewlyPressedButtons] bit 1, a jp nz, Func_1bd3 - rst $10 + rst AdvanceFrame jr Func_1a89 Func_1aa9: ; 0x1aa9 @@ -3726,7 +3726,7 @@ Func_1b3d: ; 0x1b3d ld a, [hNewlyPressedButtons] bit BIT_B_BUTTON, a jp nz, Func_1bd3 - rst $10 + rst AdvanceFrame jr Func_1b3d Func_1b60: ; 0x1b60 @@ -3747,7 +3747,7 @@ Func_1b60: ; 0x1b60 ld a, [hNewlyPressedButtons] bit BIT_B_BUTTON, a jp nz, Func_1bd3 - rst $10 + rst AdvanceFrame jr Func_1b60 Func_1b88: ; 0x1b88 @@ -3766,7 +3766,7 @@ Func_1b88: ; 0x1b88 ld a, [hNewlyPressedButtons] bit BIT_B_BUTTON, a jp nz, Func_1bd3 - rst $10 + rst AdvanceFrame jr Func_1b88 Func_1ba7: ; 0x1ba7 @@ -4310,9 +4310,7 @@ Func_1ffc: ; 0x1ffc ld a, $4 ld [$d807], a ld [$ff8a], a - ld a, Bank(Func_3c000) - ld hl, Func_3c000 - call BankSwitch + callba Func_3c000 ld a, $1 ld [$d85d], a ld a, $37 @@ -4326,7 +4324,7 @@ Func_1ffc: ; 0x1ffc call Func_2043 call Func_926 call Func_b2e - rst $10 + rst AdvanceFrame jr .asm_2025 Func_2034: ; 0x2034 @@ -6340,18 +6338,63 @@ Func_3475: ; 0x3475 ld hl, HandleFlippers call nz, BankSwitch ld [$ff8a], a - ld a, Bank(Func_84b7) - ld hl, Func_84b7 - call BankSwitch + callba Func_84b7 call Func_33e3 call Func_926 - rst $10 + rst AdvanceFrame ld a, [$d5ca] and a jr nz, Func_3475 ret - dr $34a6, $351c +Data_34a6: + dx 6, $050000000000 +Data_34ac: + dx 6, $100000000000 +Data_34b2: + dx 6, $000100000000 +Data_34b8: + dx 6, $000400000000 +Data_34be: + dx 6, $000500000000 +Data_34c4: + dx 6, $001000000000 +Data_34ca: + dx 6, $005000000000 +Data_34d0: + dx 6, $000001000000 +Data_34d6: + dx 6, $000010000000 +Data_34dc: + dx 6, $000030000000 +Data_34e2: + dx 6, $000050000000 +Data_34e8: + dx 6, $000000010000 +Data_34ee: + dx 6, $000000050000 +Data_34f4: + dx 6, $000000100000 +Data_34fa: + dx 6, $000000000100 + +Func_3500: + ld hl, $d464 + ld a, e + ld [hli], a + ld a, d + ld [hli], a + ld a, c + ld [hli], a + ld a, b + ld [hli], a + xor a + ld [hli], a + ld [hl], a + ld bc, $d464 + ldh [$ff8a], a + callba AddBCDScore + ret Func_351c: ; 0x351c ld hl, $d464 @@ -6368,9 +6411,7 @@ Func_351c: ; 0x351c ld [hl], a ld bc, $d464 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ret Func_3538: ; 0x3538 @@ -10136,7 +10177,7 @@ SECTION "bank2", ROMX, BANK[$2] Func_8000: ; 0x8000 ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_8004: ; 0x8004 dw Func_800a dw Func_8104 @@ -10378,7 +10419,7 @@ Func_814e: ; 0x414e HandleEraseAllDataMenu: ; 0x815d ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable EraseAllDataMenuFunctions: ; 0x8161 dw CheckForResetButtonCombo dw HandleEraseAllDataInput @@ -10492,7 +10533,7 @@ ExitEraseAllDataMenu: ; 0x820f HandleCopyrightScreen: ; 0x821e ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CopyrightScreenFunctions: ; 0x8222 dw FadeInCopyrightScreen dw DisplayCopyrightScreen @@ -10542,7 +10583,7 @@ DisplayCopyrightScreen: ; 0x8290 ld b, $5a ; number of frames to show the copyright screen .delayLoop push bc - rst $10 ; wait for next frame + rst AdvanceFrame ; wait for next frame pop bc ld a, b cp $2d ; player can press A button to skip copyright screen once counter is below $2d @@ -10567,9 +10608,7 @@ FadeOutCopyrightScreenAndLoadData: ; 0x82a8 call Func_f0c jr c, .loadedHighScores ld [$ff8a], a - ld a, Bank(CopyInitialHighScores) - ld hl, CopyInitialHighScores - call BankSwitch + callba CopyInitialHighScores .loadedHighScores ld hl, $a10c ld de, wPokedexFlags @@ -10577,9 +10616,7 @@ FadeOutCopyrightScreenAndLoadData: ; 0x82a8 call Func_f0c jr c, .asm_82de ld [$ff8a], a - ld a, Bank(ClearPokedexData) - ld hl, ClearPokedexData - call BankSwitch + callba ClearPokedexData .asm_82de ld hl, $a244 ld de, wKeyConfigs @@ -10587,9 +10624,7 @@ FadeOutCopyrightScreenAndLoadData: ; 0x82a8 call Func_f0c jr c, .asm_82f6 ld [$ff8a], a - ld a, Bank(SaveDefaultKeyConfigs) - ld hl, SaveDefaultKeyConfigs - call BankSwitch + callba SaveDefaultKeyConfigs .asm_82f6 ld hl, $a268 ld de, wPartyMons @@ -10820,9 +10855,7 @@ Func_8444: ; 0x8444 and a jr z, .asm_8460 ld [$ff8a], a - ld a, Bank(Func_10464) - ld hl, Func_10464 - call BankSwitch + callba Func_10464 .asm_8460 ret @@ -11020,7 +11053,7 @@ Func_8543: ; 0x8543 dr $8569, $8576 -Func_8576: ; 0x8576 +AddBCDScore: ; 0x8576 ld h, b ld l, c ld a, [$d477] @@ -11242,9 +11275,7 @@ StartTimer: ; 0x867d ld a, $1 ld [$d580], a ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a ret Func_86a4: ; 0x86a4 @@ -11395,7 +11426,7 @@ HandleInGameMenuSelection: ; 0x87ac .waitForAButton call MoveInGameMenuCursor call DrawInGameMenu - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .waitForAButton @@ -12582,7 +12613,7 @@ SECTION "bank3", ROMX, BANK[$3] HandleTitlescreen: ; 0xc000 ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable TitlescreenFunctions: ; 0xc004 dw FadeInTitlescreen dw TitlescreenLoop ; titlescreen loop @@ -12665,7 +12696,7 @@ TitlescreenLoop: ; 0xc089 .noPreviouslySavedGame ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $0027 call PlaySoundEffect ld bc, $0037 @@ -12718,7 +12749,7 @@ Func_c10e: ; 0xc10e jr z, .asm_c17c ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $0027 call PlaySoundEffect ld bc, $0041 @@ -12767,7 +12798,7 @@ Func_c10e: ; 0xc10e ld [$d911], a .asm_c18f call Func_926 - rst $10 + rst AdvanceFrame call Func_c1b1 ld a, [$d910] cp $e @@ -13042,7 +13073,7 @@ Data_c32b: ; 0xc32b HandleOptionsScreen: ; 0xc34a ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable OptionsScreenFunctions: ; 0xc34e dw Func_c35a dw Func_c400 @@ -13345,7 +13376,7 @@ Func_c55a: ; 0xc55a call Func_c621 call Func_c554 call Func_926 - rst $10 + rst AdvanceFrame pop hl pop bc ld a, [hJoypadState] @@ -13386,7 +13417,7 @@ Func_c55a: ; 0xc55a call Func_c621 call Func_c554 call Func_926 - rst $10 + rst AdvanceFrame pop hl pop de pop bc @@ -13492,9 +13523,9 @@ Func_c691: ; 0xc91 ret z ld de, $0000 call PlaySong - rst $10 - rst $10 - rst $10 + rst AdvanceFrame + rst AdvanceFrame + rst AdvanceFrame ld a, $12 call SetSongBank ld de, $0002 @@ -13542,9 +13573,9 @@ Func_c6e8: ; 0xc6e8 jr z, UpdateSoundTestBackgroundMusicSelection ld de, $0000 call PlaySong - rst $10 - rst $10 - rst $10 + rst AdvanceFrame + rst AdvanceFrame + rst AdvanceFrame ld a, [wSoundTestCurrentBackgroundMusic] sla a ld c, a @@ -14100,7 +14131,7 @@ DefaultKeyConfigs: ; 0xca55 HandleHighScoresScreen: ; 0xca7f ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable HighScoresScreenFunctions: ; 0xca83 dw Func_ca8f dw Func_cb14 @@ -14434,7 +14465,7 @@ Func_ccb6: ; 0xccb6 ld a, $94 call LoadOAMData .asm_cd16 - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_B_BUTTON, a jr z, .asm_cd24 @@ -14498,7 +14529,7 @@ Func_cd6c: ; 0xcd6c jr z, .asm_cdbb ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame call Func_cdce push af ld de, $0004 @@ -14583,7 +14614,7 @@ Func_cdce: ; 0xcdce ld [$abf6], a pop af call Func_ceca - rst $10 + rst AdvanceFrame ld hl, $c4cc ld b, $5 .asm_ce5d @@ -14640,7 +14671,7 @@ Func_cdce: ; 0xcdce ld [$abf6], a pop af call Func_ceca - rst $10 + rst AdvanceFrame push af ld a, $a ld [$abf6], a @@ -14667,7 +14698,7 @@ SendHighScores: ; 0xced1 ld a, $8f call LoadOAMData call Func_926 - rst $10 + rst AdvanceFrame ld a, $1 ld [$d8e9], a ld b, $b4 ; maximum attempts to send high scores @@ -14733,13 +14764,13 @@ Func_cf58: ; 0xcf58 ld de, $0002 call PlaySoundEffect call ClearOAMBuffer - rst $10 + rst AdvanceFrame pop af ld bc, $473b ; todo add $8f call LoadOAMData .asm_cf6f - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_cf6f @@ -15605,7 +15636,7 @@ Func_d4cf: ; 0xd4cf inc [hl] inc [hl] inc [hl] - rst $10 + rst AdvanceFrame pop bc dec b jr nz, .asm_d508 @@ -15646,7 +15677,7 @@ Func_d4cf: ; 0xd4cf dec [hl] dec [hl] dec [hl] - rst $10 + rst AdvanceFrame pop bc dec b jr nz, .asm_d551 @@ -15666,7 +15697,7 @@ Func_d57b: ; 0xd57b ld [$ffab], a ld a, $10 ld [$ffad], a - rst $10 + rst AdvanceFrame ld a, BANK(HighScoresTilemap) ld hl, HighScoresTilemap ld de, $9800 @@ -15694,7 +15725,7 @@ Func_d57b: ; 0xd57b inc [hl] ld hl, $ffad dec [hl] - rst $10 + rst AdvanceFrame pop bc dec b jr nz, .asm_d5c1 @@ -15708,7 +15739,7 @@ Func_d5d0: ; 0xd5d0 dec [hl] ld hl, $ffad inc [hl] - rst $10 + rst AdvanceFrame pop bc dec b jr nz, .asm_d5d2 @@ -15845,7 +15876,7 @@ Func_d6b6: ; 0xd6b6 HandleFieldSelectScreen: ; 0xd6d3 ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable FieldSelectScreenFunctions: ; 0xd6d7 dw LoadFieldSelectScreen dw ChooseFieldToPlay @@ -16050,7 +16081,7 @@ Data_d84f: HandlePinballGame: ; 0xd853 ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable PinballGameScreenFunctions: ; 0xd857 dw Func_d861 dw Func_d87f @@ -16062,9 +16093,7 @@ Func_d861: ; 0xd861 xor a ld [$d908], a ld [$ff8a], a - ld a, Bank(InitializeStage) - ld hl, InitializeStage - call BankSwitch + callba InitializeStage call Func_30e8 ld a, $1 ld [$d85d], a @@ -16100,26 +16129,16 @@ Func_d87f: ; 0xd87f ld a, $1 ld [$ffb0], a ld [$ff8a], a - ld a, Bank(StartBallForStage) - ld hl, StartBallForStage - call BankSwitch + callba StartBallForStage ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes ld [$ff8a], a - ld a, Bank(Func_e6c2) - ld hl, Func_e6c2 - call BankSwitch + callba Func_e6c2 ld [$ff8a], a - ld a, Bank(Func_ed5e) - ld hl, Func_ed5e - call BankSwitch + callba Func_ed5e call ClearOAMBuffer ld [$ff8a], a - ld a, Bank(Func_84b7) - ld hl, Func_84b7 - call BankSwitch + callba Func_84b7 ld a, [$d849] and a call nz, Func_e5d @@ -16167,9 +16186,7 @@ Func_d909: ; 0xd909 ld de, $034c call PlaySoundEffect ld [$ff8a], a - ld a, Bank(HandleInGameMenu) - ld hl, HandleInGameMenu - call BankSwitch + callba HandleInGameMenu jp z, SaveGame .didntPressMenuKey ld a, [$d7e9] ; check for collision flag @@ -16215,29 +16232,19 @@ Func_d909: ; 0xd909 .asm_d9a2 call MoveBallPosition ld [$ff8a], a - ld a, Bank(Func_ece9) - ld hl, Func_ece9 - call BankSwitch + callba Func_ece9 ld [$ff8a], a - ld a, Bank(Func_84b7) - ld hl, Func_84b7 - call BankSwitch + callba Func_84b7 call Func_33e3 ld a, [$d5cb] and a jr nz, .asm_d9e9 ld [$ff8a], a - ld a, Bank(Func_85c7) - ld hl, Func_85c7 - call BankSwitch + callba Func_85c7 ld [$ff8a], a - ld a, Bank(Func_8650) - ld hl, Func_8650 - call BankSwitch + callba Func_8650 ld [$ff8a], a - ld a, Bank(Func_8645) - ld hl, Func_8645 - call BankSwitch + callba Func_8645 call Func_dba9 call Func_dc7c call Func_dcb4 @@ -16298,14 +16305,10 @@ Func_da36: ; 0xda36 ld hl, HandleFlippers call nz, BankSwitch ld [$ff8a], a - ld a, Bank(Func_84b7) - ld hl, Func_84b7 - call BankSwitch + callba Func_84b7 call Func_33e3 ld [$ff8a], a - ld a, Bank(Func_85c7) - ld hl, Func_85c7 - call BankSwitch + callba Func_85c7 ld a, [$d5ca] and a ret nz @@ -16338,7 +16341,7 @@ Func_da36: ; 0xda36 Func_dab2: ; 0xdab2 xor a ld [$d803], a - ld a, [$d616] + ld a, [wGameOver] and a jp nz, TransitionToHighScoresScreen ld a, [$d495] @@ -16409,7 +16412,7 @@ Func_dab2: ; 0xdab2 TransitionToHighScoresScreen: ; 0xdb5d xor a - ld [$d616], a + ld [wGameOver], a ld de, $0000 call PlaySong ld bc, $0004 @@ -16529,14 +16532,12 @@ Func_dc00: ; 0xdc00 bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_14707) - ld hl, Func_14707 - call BankSwitch + callba Func_14707 ret Func_dc49: ; 0xdc49 ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_dc4d: ; 0xdc4d ; STAGE_RED_FIELD_TOP dw Func_dd76 @@ -16782,7 +16783,7 @@ Func_dd76: ; 0xdd76 ld de, $28ee call Func_dc6d ld a, $1 - ld [$d616], a + ld [wGameOver], a ret Func_ddfd: ; 0xddfd @@ -16793,9 +16794,7 @@ Func_ddfd: ; 0xddfd and a jr nz, .asm_de14 ld [$ff8a], a - ld a, Bank(Func_10157) - ld hl, Func_10157 - call BankSwitch + callba Func_10157 jr .asm_de40 .asm_de14 cp $1 @@ -16805,9 +16804,7 @@ Func_ddfd: ; 0xddfd ld a, $1e ld [$d607], a ld [$ff8a], a - ld a, Bank(Func_10ac8) - ld hl, Func_10ac8 - call BankSwitch + callba Func_10ac8 jr .asm_de40 .asm_de2d xor a @@ -16815,9 +16812,7 @@ Func_ddfd: ; 0xddfd ld a, $1e ld [$d607], a ld [$ff8a], a - ld a, Bank(Func_3022b) - ld hl, Func_3022b - call BankSwitch + callba Func_3022b .asm_de40 ld a, [$d7ad] ld c, a @@ -16890,7 +16885,7 @@ Func_de4f: ; 0xde4f ld de, $28ee call Func_dc6d ld a, $1 - ld [$d616], a + ld [wGameOver], a ret Func_ded6: ; 0xded6 @@ -16901,9 +16896,7 @@ Func_ded6: ; 0xded6 and a jr nz, .asm_deec ld [$ff8a], a - ld a, Bank(Func_10157) - ld hl, Func_10157 - call BankSwitch + callba Func_10157 ret .asm_deec cp $1 @@ -16913,9 +16906,7 @@ Func_ded6: ; 0xded6 ld a, $1e ld [$d607], a ld [$ff8a], a - ld a, Bank(Func_10ac8) - ld hl, Func_10ac8 - call BankSwitch + callba Func_10ac8 ret .asm_df05 ld a, $0 @@ -16923,9 +16914,7 @@ Func_ded6: ; 0xded6 ld a, $1e ld [$d607], a ld [$ff8a], a - ld a, Bank(Func_3022b) - ld hl, Func_3022b - call BankSwitch + callba Func_3022b ret Func_df1a: ; 0xdf1a @@ -17050,9 +17039,7 @@ Func_dfe2: ; 0xdfe2 .asm_e002 ld [wMeowthStageScore], a ld [$ff8a], a - ld a, Bank(Func_24fa3) - ld hl, Func_24fa3 - call BankSwitch + callba Func_24fa3 .asm_e00f ld a, [$d4ad] ld hl, wCurrentStage @@ -17134,9 +17121,7 @@ Func_e08b: ; 0xe08b .asm_e0ab ld [$d793], a ld [$ff8a], a - ld a, Bank(Func_262f4) - ld hl, Func_262f4 - call BankSwitch + callba Func_262f4 .asm_e0b8 ld a, [$d4ad] ld hl, wCurrentStage @@ -17191,12 +17176,12 @@ Func_e118: ; 0xe118 ld [wRightFlipperAnimationState], a ld hl, wKeyConfigLeftFlipper call IsKeyPressed2 - ld hl, $fccd + ld hl, -$0333 jr z, .asm_e13b ld a, [$d7be] and a jr nz, .asm_e13b - ld hl, $0333 + ld hl, $0333 .asm_e13b ld a, [$d7af] and a @@ -17236,12 +17221,12 @@ Func_e118: ; 0xe118 ld [$d7af], a ld hl, wKeyConfigRightFlipper call IsKeyPressed2 - ld hl, $fccd + ld hl, -$0333 jr z, .asm_e18e ld a, [$d7be] and a jr nz, .asm_e18e - ld hl, $0333 + ld hl, $0333 .asm_e18e ld a, [$d7b3] and a @@ -17934,9 +17919,7 @@ Func_e674: ; 0xe674 ld [$d548], a ld [$d803], a ld [$ff8a], a - ld a, Bank(Func_84b7) - ld hl, Func_84b7 - call BankSwitch + callba Func_84b7 call Func_926 pop af ld [$d548], a @@ -17946,7 +17929,7 @@ Func_e674: ; 0xe674 ld [$ffa3], a ld [$ffa4], a ld [$ffa5], a - rst $10 + rst AdvanceFrame call Func_e5d call Func_576 call ClearOAMBuffer @@ -17986,9 +17969,7 @@ Func_e6c2: ; 0xe6c2 xor a ld [$d7f2], a ld [$ff8a], a - ld a, Bank(Func_8471) - ld hl, Func_8471 - call BankSwitch + callba Func_8471 ret StageGfxPointers_GameBoy: ; 0xe6f7 @@ -18340,9 +18321,7 @@ Func_ece9: ; 0xece9 ld a, $1 ld [$d4ae], a ld [$ff8a], a - ld a, Bank(Func_dc49) - ld hl, Func_dc49 - call BankSwitch + callba Func_dc49 ret BallMovingUpStageTransitions: ; 0xed3e @@ -18441,12 +18420,10 @@ Func_ed8e: ; 0xed8e ld hl, HandleFlippers call nz, BankSwitch ld [$ff8a], a - ld a, Bank(Func_84b7) - ld hl, Func_84b7 - call BankSwitch + callba Func_84b7 call Func_33e3 call Func_926 - rst $10 + rst AdvanceFrame ld a, [$d7af] and a jr nz, .asm_edac @@ -18535,7 +18512,7 @@ Func_ed8e: ; 0xed8e ld b, $28 .asm_ee80 push bc - rst $10 + rst AdvanceFrame pop bc call Func_ef1e jr nz, .asm_ee8b @@ -18561,7 +18538,7 @@ Func_ed8e: ; 0xed8e ld a, [$d61d] call LoadBillboardOffPicture .asm_eeae - rst $10 + rst AdvanceFrame pop bc call Func_ef1e jr nz, .asm_eeb8 @@ -18576,7 +18553,7 @@ Func_ed8e: ; 0xed8e .asm_eec3 ld [$d619], a ld a, [$d61d] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_eeca: ; 0xeeca dw Func_ef35 dw Func_ef4f @@ -18703,21 +18680,17 @@ Func_ef83: ; 0xef83 xor a ld [$d85d], a call Func_310a - rst $10 + rst AdvanceFrame ld a, $0 ld [$ff8a], a - ld a, Bank(PlayPikachuSoundClip) - ld hl, PlayPikachuSoundClip - call BankSwitch + callba PlayPikachuSoundClip ld a, $1 ld [$d85d], a ret Func_efa7: ; 0xefa7 ld [$ff8a], a - ld a, Bank(Func_30164) - ld hl, Func_30164 - call BankSwitch + callba Func_30164 ret Func_efb2: ; 0xefb2 @@ -18741,7 +18714,7 @@ Func_efb2: ; 0xefb2 add $12 call LoadBillboardOffPicture .asm_efd8 - rst $10 + rst AdvanceFrame pop bc ld a, [hNewlyPressedButtons] and $21 @@ -18779,7 +18752,7 @@ Func_eff3: ; 0xeff3 add $1b call LoadBillboardOffPicture .asm_f019 - rst $10 + rst AdvanceFrame pop bc ld a, [hNewlyPressedButtons] and $21 @@ -18838,9 +18811,7 @@ UpgradeBallBlueField: ; 0xf040 call PlaySoundEffect ld bc, $34e8 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $100 ld de, $0000 push bc @@ -18857,9 +18828,7 @@ UpgradeBallBlueField: ; 0xf040 call Func_32aa .asm_f0b0 ld [$ff8a], a - ld a, Bank(Func_155bb) - ld hl, Func_155bb - call BankSwitch + callba Func_155bb ret BallTypeProgressionBlueField: ; 0xf0bb @@ -18892,7 +18861,7 @@ Func_f0c1: ; 0xf0c1 add $24 call LoadBillboardOffPicture .asm_f0e7 - rst $10 + rst AdvanceFrame pop bc ld a, [hNewlyPressedButtons] and $21 @@ -18925,20 +18894,14 @@ Func_f0c1: ; 0xf0c1 ld hl, Func_30164 call nz, BankSwitch ld [$ff8a], a - ld a, Bank(Func_16f95) - ld hl, Func_16f95 - call BankSwitch + callba Func_16f95 ld a, [$d60c] ld [$ff8a], a - ld a, Bank(Func_f154) - ld hl, Func_f154 - call BankSwitch ; no need for BankSwitch here... + callba Func_f154 ; no need for BankSwitch here... ld a, [$d60d] add $14 ld [$ff8a], a - ld a, Bank(Func_f154) - ld hl, Func_f154 - call BankSwitch ; no need for BankSwitch here... + callba Func_f154 ; no need for BankSwitch here... ret Func_f14a: ; 0xf14a @@ -19386,11 +19349,11 @@ Func_f57f: ; 0xf57f Func_f5a0: ; 0xf5a0 ld de, wcBottomMessageText + $40 - ld hl, $3069 ; todo - call Func_f7b1 + ld hl, Data_3069 ; todo + call PrintTextNoHeader ld de, wcBottomMessageText + $80 - ld hl, $3070 - call Func_f7b1 + ld hl, Data_3070 + call PrintTextNoHeader ld hl, $d489 call Func_f8b5 ld hl, $d48f @@ -19404,7 +19367,7 @@ Func_f5a0: ; 0xf5a0 ld a, $1 ld [$d4ab], a call Func_f70d - ld a, [$d616] + ld a, [wGameOver] and a ret z ld a, $10 @@ -19415,13 +19378,13 @@ Func_f5a0: ; 0xf5a0 ld bc, $0040 call Func_f81b ld de, wcBottomMessageText + $20 - ld hl, $3094 - call Func_f7b1 + ld hl, Data_3094 + call PrintTextNoHeader ld bc, $0040 ld de, $0000 call Func_f80d .asm_f602 - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_f602 @@ -19429,7 +19392,7 @@ Func_f5a0: ; 0xf5a0 Func_f60a: ; 0xf60a ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_f60d: ; 0xf60d ; STAGE_RED_FIELD_TOP dw Func_f945 @@ -19467,8 +19430,8 @@ CallTable_f60d: ; 0xf60d Func_f626: ; 0xf626 ld de, wcBottomMessageText + $01 - ld hl, $3006 ; todo - call Func_f7b1 + ld hl, Data_3006 ; todo + call PrintTextNoHeader ld hl, wcBottomMessageText + $01 ld a, [$d628] call Func_f78e @@ -19483,8 +19446,8 @@ Func_f626: ; 0xf626 Func_f64e: ; 0xf64e ld de, wcBottomMessageText - ld hl, $3019 ; todo - call Func_f7b1 + ld hl, Data_3019 ; todo + call PrintTextNoHeader ld hl, wcBottomMessageText ld a, [$d629] call Func_f78e @@ -19511,7 +19474,7 @@ Func_f676: ; 0xf676 ld a, [$d4ab] and a jr z, .asm_f69f - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_f69f @@ -19522,11 +19485,11 @@ Func_f676: ; 0xf676 dec b jr nz, .asm_f678 ld de, wcBottomMessageText + $40 - ld hl, $307a ; todo - call Func_f7b1 + ld hl, Data_307a ; todo + call PrintTextNoHeader ld de, wcBottomMessageText + $80 - ld hl, $3086 ; todo - call Func_f7b1 + ld hl, Data_3086 ; todo + call PrintTextNoHeader ld hl, wcBottomMessageText + $50 ld a, [$d482] call Func_f78e @@ -19547,7 +19510,7 @@ Func_f676: ; 0xf676 ld a, [$d4ab] and a jr z, .asm_f6f2 - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_f6f2 @@ -19583,7 +19546,7 @@ Func_f70d: ; 0xf70d ld a, [$d4ab] and a jr z, .asm_f736 - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_f736 @@ -19594,8 +19557,8 @@ Func_f70d: ; 0xf70d dec b jr nz, .asm_f70f ld de, wcBottomMessageText + $60 - ld hl, $308d - call Func_f7b1 + ld hl, Data_308d + call PrintTextNoHeader ld hl, $d46f ld de, wcBottomMessageText + $66 call Func_f8bd @@ -19607,7 +19570,7 @@ Func_f70d: ; 0xf70d ld a, [$d4ab] and a jr z, .asm_f76c - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_f76c @@ -19654,7 +19617,7 @@ Func_f78e: ; 0xf78e ld c, $0 ret -Func_f7b1: ; 0xf7b1 +PrintTextNoHeader: ; 0xf7b1 ld a, [$d805] and a jr nz, .asm_f7e0 @@ -19754,7 +19717,7 @@ Func_f83a: ; 0xf83a ld b, $46 .asm_f841 push bc - rst $10 + rst AdvanceFrame pop bc ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a @@ -19786,7 +19749,7 @@ Func_f853: ; 0xf853 ld a, [$d4ab] and a jr z, .asm_f886 - rst $10 + rst AdvanceFrame ld a, [hNewlyPressedButtons] bit BIT_A_BUTTON, a jr z, .asm_f886 @@ -19936,7 +19899,7 @@ Func_f945: ; 0xf945 Func_f952: ; 0xf952 ld de, wcBottomMessageText + $03 ld hl, BellsproutCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $03 ld a, [$d62a] call Func_f78e @@ -19952,7 +19915,7 @@ Func_f952: ; 0xf952 Func_f97a: ; 0xf97a ld de, wcBottomMessageText + $04 ld hl, DugtrioCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $04 ld a, [$d62b] call Func_f78e @@ -19968,7 +19931,7 @@ Func_f97a: ; 0xf97a Func_f9a2: ; 0xf9a2 ld de, wcBottomMessageText + $03 ld hl, CaveShotCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $03 ld a, [$d62c] call Func_f78e @@ -19984,7 +19947,7 @@ Func_f9a2: ; 0xf9a2 Func_f9ca: ; 0xf9ca ld de, wcBottomMessageText + $01 ld hl, SpinnerTurnsCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $01 ld a, [$d62d] call Func_f78e @@ -20012,7 +19975,7 @@ Func_f9f3: ; 0xf9f3 Func_fa06: ; 0xfa06 ld de, wcBottomMessageText + $04 ld hl, CloysterCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $04 ld a, [$d63b] call Func_f78e @@ -20028,7 +19991,7 @@ Func_fa06: ; 0xfa06 Func_fa2e: ; 0xfa2e ld de, wcBottomMessageText + $04 ld hl, SlowpokeCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $04 ld a, [$d63a] call Func_f78e @@ -20044,7 +20007,7 @@ Func_fa2e: ; 0xfa2e Func_fa56: ; 0xfa56 ld de, wcBottomMessageText + $04 ld hl, PoliwagCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $04 ld a, [$d63d] call Func_f78e @@ -20060,7 +20023,7 @@ Func_fa56: ; 0xfa56 Func_fa7e: ; 0xfa7e ld de, wcBottomMessageText + $04 ld hl, PsyduckCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $04 ld a, [$d63c] call Func_f78e @@ -20076,7 +20039,7 @@ Func_fa7e: ; 0xfa7e Func_faa6: ; 0xfaa6 ld de, wcBottomMessageText + $03 ld hl, CaveShotCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $03 ld a, [$d62c] call Func_f78e @@ -20092,7 +20055,7 @@ Func_faa6: ; 0xfaa6 Func_face: ; 0xface :) ld de, wcBottomMessageText + $01 ld hl, SpinnerTurnsCounterText - call Func_f7b1 + call PrintTextNoHeader ld hl, wcBottomMessageText + $01 ld a, [$d62d] call Func_f78e @@ -20136,9 +20099,7 @@ Func_10000: ; 0x10000 cp $2 jr nz, .asm_10021 ld [$ff8a], a - ld a, Bank(Func_301ce) - ld hl, Func_301ce - call BankSwitch + callba Func_301ce ret .asm_10021 ld a, [wCurrentStage] @@ -20269,13 +20230,9 @@ StartCatchEmMode: ; 0x1003f ld a, [hl] ld b, a ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld [$ff8a], a - ld a, Bank(InitBallSaverForCatchEmMode) - ld hl, InitBallSaverForCatchEmMode - call BankSwitch + callba InitBallSaverForCatchEmMode call Func_10696 call Func_3579 ld a, [wCurrentStage] @@ -20294,7 +20251,7 @@ StartCatchEmMode: ; 0x1003f .asm_1011d call SetPokemonSeenFlag ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_10124: ; 0x10124 ; STAGE_RED_FIELD_TOP dw Func_10871 @@ -20351,11 +20308,9 @@ Func_10157: ; 0x10157 ld [wNumMonHits], a call Func_10488 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_10178: ; 0x10178 ; STAGE_RED_FIELD_TOP dw Func_108f5 @@ -20931,7 +20886,7 @@ CapturePokemon: ; 0x1052d call Func_3475 ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $2329 call PlaySoundEffect call Func_10825 @@ -20953,9 +20908,7 @@ CapturePokemon: ; 0x1052d ld [$d548], a ld [$d549], a ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 call Func_10157 ld de, $0001 call PlaySong @@ -21234,9 +21187,7 @@ Func_107b0: ; 0x107b0 ld [$d604], a ld [wIndicatorStates + 4], a ld [$ff8a], a - ld a, Bank(Func_16425) - ld hl, Func_16425 - call BankSwitch + callba Func_16425 ret Func_107c2: ; 0x107c2 @@ -21318,9 +21269,7 @@ Func_10825: ; 0x10825 Func_10848: ; 0x10848 ld bc, $34fa ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 call Func_30e8 call Func_30db ld hl, $d5d4 @@ -21377,23 +21326,15 @@ Func_10871: ; 0x10871 bit 0, a jr nz, .asm_108d3 ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes ld [$ff8a], a - ld a, Bank(Func_159f4) - ld hl, Func_159f4 - call BankSwitch + callba Func_159f4 ret .asm_108d3 ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -21411,14 +21352,10 @@ Func_108f5: ; 0x108f5 bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 call Func_10432 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ld a, Bank(StageSharedBonusSlotGlowGfx) ld hl, StageSharedBonusSlotGlowGfx ld de, $81a0 @@ -21434,9 +21371,7 @@ Func_108f5: ; 0x108f5 call Func_10aa ld a, [$d624] ld [$ff8a], a - ld a, Bank(Func_174d4) - ld hl, Func_174d4 - call BankSwitch + callba Func_174d4 ld hl, Data_1097d ld a, $4 call Func_10aa @@ -21491,18 +21426,14 @@ Func_1098c: ; 0x1098c xor a ld [wRightAlleyCount], a ld [$ff8a], a - ld a, Bank(Func_1f2ed) - ld hl, Func_1f2ed - call BankSwitch + callba Func_1f2ed ld de, $0002 call PlaySong ld a, [wCurrentStage] bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ld [$ff8a], a ld a, $4 ld hl, Func_10184 @@ -21519,21 +21450,15 @@ Func_109fc: ; 0x109fc call Func_107a5 call Func_107c2 ld [$ff8a], a - ld a, Bank(Func_1f2ff) - ld hl, Func_1f2ff - call BankSwitch + callba Func_1f2ff ld a, [wCurrentStage] bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb call Func_10432 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ld a, BANK(StageSharedBonusSlotGlowGfx) ld hl, StageSharedBonusSlotGlowGfx ld de, $81a0 @@ -21549,9 +21474,7 @@ Func_109fc: ; 0x109fc call Func_10aa ld a, [$d624] ld [$ff8a], a - ld a, Bank(Func_174d4) - ld hl, Func_174d4 - call BankSwitch + callba Func_174d4 ld hl, Data_10a88 ld a, $4 call Func_10aa @@ -21594,7 +21517,7 @@ Func_10ab3: ; 0x10ab3 and a ret nz ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_10abc: ; 0x10abc ; STAGE_RED_FIELD_TOP dw Func_10ebb @@ -21625,11 +21548,9 @@ Func_10ac8: ; 0x10ac8 ld [$d554], a call Func_10488 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_10af3: ; 0x10af3 ; STAGE_RED_FIELD_TOP dw Func_10fe3 @@ -21808,7 +21729,7 @@ Func_10bea: ; 0x10bea call Func_10c0c call Func_b2e call Func_10c38 - rst $10 + rst AdvanceFrame ld a, [$d809] bit 0, a jr z, .asm_10bf4 @@ -22004,9 +21925,7 @@ Func_10d1d: ; 0x10d1d ld a, [hl] ld b, a ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld a, [wCurrentCatchEmMon] ld c, a ld b, $0 @@ -22087,9 +22006,7 @@ Func_10d1d: ; 0x10d1d dec b jr nz, .asm_10dc0 ld [$ff8a], a - ld a, Bank(InitBallSaverForCatchEmMode) - ld hl, InitBallSaverForCatchEmMode - call BankSwitch + callba InitBallSaverForCatchEmMode call Func_10b3f call Func_3579 ld a, [wCurrentStage] @@ -22184,9 +22101,7 @@ Func_10e0a: ; 0x10e0a Func_10e8b: ; 0x10e8b ld bc, $34e8 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0100 ld de, $0000 push bc @@ -22237,26 +22152,22 @@ Func_10ebb: ; 0x10ebb ld a, [wCurrentStage] bit 0, a jr nz, .asm_10f0b - ld a, $36 - ld hl, $7e80 + ld a, BANK(Data_dbe80) + ld hl, Data_dbe80 ld de, $8900 ld bc, $00e0 call Func_735 ret .asm_10f0b - ld a, $36 - ld hl, $7e80 + ld a, BANK(Data_dbe80) + ld hl, Data_dbe80 ld de, $8200 ld bc, $00e0 call Func_735 ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -22308,41 +22219,33 @@ Func_10fe3: ; 0x10fe3 bit 0, a jp z, Func_10aff ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ld [$ff8a], a - ld a, Bank(Func_16425) - ld hl, Func_16425 - call BankSwitch + callba Func_16425 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch - ld a, $36 - ld hl, $6c60 + callba Func_30253 + ld a, BANK(StageSharedBonusSlotGlowGfx) + ld hl, StageSharedBonusSlotGlowGfx + $60 ld de, $8200 ld bc, $00e0 call LoadVRAMData ld a, [hGameBoyColorFlag] and a jr z, .asm_11036 - ld a, $37 - ld hl, $4af8 + ld a, BANK(StageRedFieldBottomOBJPalette7) + ld hl, StageRedFieldBottomOBJPalette7 ld de, $0078 ld bc, $0008 call Func_7dc .asm_11036 - ld hl, $4958 - ld a, $4 + ld hl, Data_10958 + ld a, BANK(Data_10958) call Func_10aa ld a, [$d624] ld [$ff8a], a - ld a, Bank(Func_174d4) - ld hl, Func_174d4 - call BankSwitch - ld hl, $497d - ld a, $4 + callba Func_174d4 + ld hl, Data_1097d + ld a, BANK(Data_1097d) call Func_10aa ret @@ -22385,9 +22288,7 @@ Func_11061: ; 0x11061 xor a ld [wLeftAlleyCount], a ld [$ff8a], a - ld a, Bank(Func_1f2ed) - ld hl, Func_1f2ed - call BankSwitch + callba Func_1f2ed ld a, $2 ld [$d7ad], a ld de, $0002 @@ -22396,26 +22297,22 @@ Func_11061: ; 0x11061 ld a, [wCurrentStage] bit 0, a jr nz, .asm_110bd - ld a, $36 - ld hl, $7e80 + ld a, BANK(Data_dbe80) + ld hl, Data_dbe80 ld de, $8600 ld bc, $00e0 call Func_735 ret .asm_110bd - ld a, $36 - ld hl, $7e80 + ld a, BANK(Data_dbe80) + ld hl, Data_dbe80 ld de, $8200 ld bc, $00e0 call Func_735 ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -22464,48 +22361,38 @@ Func_11195: ; 0x11195 call Func_107a5 call Func_107c2 ld [$ff8a], a - ld a, Bank(Func_1f2ff) - ld hl, Func_1f2ff - call BankSwitch + callba Func_1f2ff ld a, [wCurrentStage] bit 0, a jp z, Func_1120e ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ld [$ff8a], a - ld a, Bank(Func_1e8f6) - ld hl, Func_1e8f6 - call BankSwitch + callba Func_1e8f6 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch - ld a, $36 - ld hl, $6c60 + callba Func_30253 + ld a, Bank(StageSharedBonusSlotGlowGfx) + ld hl, StageSharedBonusSlotGlowGfx + $60 ld de, $8200 ld bc, $00e0 call LoadVRAMData ld a, [hGameBoyColorFlag] and a jr z, .asm_111f0 - ld a, $37 - ld hl, $4bf8 + ld a, BANK(StageBlueFieldBottomOBJPalette7) + ld hl, StageBlueFieldBottomOBJPalette7 ld de, $0078 ld bc, $0008 call Func_7dc .asm_111f0 - ld hl, $4a63 - ld a, $4 + ld hl, Data_10a63 + ld a, BANK(Data_10a63) call Func_10aa ld a, [$d624] ld [$ff8a], a - ld a, Bank(Func_174d4) - ld hl, Func_174d4 - call BankSwitch - ld hl, $4a88 - ld a, $4 + callba Func_174d4 + ld hl, Data_10a88 + ld a, BANK(Data_10a88) call Func_10aa ret @@ -24889,9 +24776,7 @@ Func_14091: ; 0x14091 bit 0, a ret nz ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_159f4 ret @@ -24968,13 +24853,9 @@ Func_1414b: ; 0x1414b jp Func_14210 .asm_14165 ld [$ff8a], a - ld a, Bank(Func_141f2) - ld hl, Func_141f2 - call BankSwitch + callba Func_141f2 ld [$ff8a], a - ld a, Bank(Func_10362) - ld hl, Func_10362 - call BankSwitch + callba Func_10362 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -24984,13 +24865,13 @@ Func_1414b: ; 0x1414b ld a, [$d5f3] and a ret z - ld a, $2a - ld hl, $47e0 + ld a, BANK(PikachuSaverGfx) + ld hl, PikachuSaverGfx + $c0 ld de, $87e0 ld bc, $0020 call FarCopyData - ld a, $2a - ld hl, $4800 + ld a, BANK(GFX_a8800) + ld hl, GFX_a8800 ld de, $8900 ld bc, $0180 call FarCopyData @@ -25059,9 +24940,7 @@ Func_14210: ; 0x14210 dec b jr nz, .asm_14215 ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -25083,15 +24962,15 @@ Func_14234: ; 0x14234 ld a, [wCurrentStage] bit 0, a jr nz, .asm_1425c - ld a, $36 - ld hl, $7e80 + ld a, BANK(Data_dbe80) + ld hl, Data_dbe80 ld de, $8900 ld bc, $00e0 call FarCopyData jr .asm_1426a .asm_1425c - ld a, $36 - ld hl, $7e80 + ld a, BANK(Data_dbe80) + ld hl, Data_dbe80 ld de, $8200 ld bc, $00e0 call FarCopyData @@ -25102,8 +24981,8 @@ Func_14234: ; 0x14234 ld a, [hGameBoyColorFlag] and a ret z - ld a, $37 - ld hl, $5188 + ld a, BANK(Data_dd188) + ld hl, Data_dd188 ld de, $0070 ld bc, $0010 call Func_6fd @@ -25128,8 +25007,8 @@ Func_14282: ; 0x14282 .asm_1429e ld a, [$d624] call Func_174d4 - ld a, $36 - ld hl, $4f60 + ld a, BANK(Data_d8f60) + ld hl, Data_d8f60 ld de, $8ae0 ld bc, $0020 call FarCopyData @@ -25138,9 +25017,7 @@ Func_14282: ; 0x14282 Func_142b3: ; 0x142b3 push af ld [$ff8a], a - ld a, Bank(Func_10611) - ld hl, Func_10611 - call BankSwitch + callba Func_10611 pop af dec a jr nz, Func_142b3 @@ -25168,7 +25045,7 @@ Func_142d7: ; 0x142d7 ld b, $0 swap c sla c - ld hl, $4e80 + ld hl, Data_d8e80 add hl, bc swap e sla e @@ -25179,7 +25056,7 @@ Func_142d7: ; 0x142d7 ld e, l pop hl ld bc, $0020 - ld a, $36 + ld a, BANK(Data_d8e80) call FarCopyData pop de pop bc @@ -25190,23 +25067,17 @@ Func_142fc: ; 0x142fc and a jr nz, .asm_1430e ld [$ff8a], a - ld a, Bank(LoadBallGfx) - ld hl, LoadBallGfx - call BankSwitch + callba LoadBallGfx jr .asm_14328 .asm_1430e cp $1 jr nz, .asm_1431e ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx jr .asm_14328 .asm_1431e ld [$ff8a], a - ld a, Bank(Func_dd62) - ld hl, Func_dd62 - call BankSwitch + callba Func_dd62 .asm_14328 ld a, [hGameBoyColorFlag] and a @@ -25214,8 +25085,8 @@ Func_142fc: ; 0x142fc ld a, [wBallType] cp GREAT_BALL jr nc, .notPokeball - ld a, $37 - ld hl, $5168 + ld a, BANK(PokeBallObjPalette) + ld hl, PokeBallObjPalette ld de, $0040 ld bc, $0008 call Func_6fd @@ -25223,8 +25094,8 @@ Func_142fc: ; 0x142fc .notPokeball cp ULTRA_BALL jr nc, .notGreatball - ld a, $37 - ld hl, $5170 + ld a, BANK(GreatBallObjPalette) + ld hl, GreatBallObjPalette ld de, $0040 ld bc, $0008 call Func_6fd @@ -25232,15 +25103,15 @@ Func_142fc: ; 0x142fc .notGreatball cp MASTER_BALL jr nc, .notUltraball - ld a, $37 - ld hl, $5178 + ld a, BANK(UltraBallObjPalette) + ld hl, UltraBallObjPalette ld de, $0040 ld bc, $0008 call Func_6fd ret .notUltraball - ld a, $37 - ld hl, $5180 + ld a, BANK(MasterBallObjPalette) + ld hl, MasterBallObjPalette ld de, $0040 ld bc, $0008 call Func_6fd @@ -25256,9 +25127,7 @@ Func_14377: ; 0x14377 ld a, [$d498] add $15 ld [$ff8a], a - ld a, Bank(Func_30256) - ld hl, Func_30256 - call BankSwitch + callba Func_30256 ret .asm_14393 ld a, [$d608] @@ -25266,15 +25135,11 @@ Func_14377: ; 0x14377 jr z, .asm_143a6 ld a, $1a ld [$ff8a], a - ld a, Bank(Func_30256) - ld hl, Func_30256 - call BankSwitch + callba Func_30256 ret .asm_143a6 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ret .asm_143b1 ld a, [wSpecialMode] @@ -25284,9 +25149,7 @@ Func_14377: ; 0x14377 cp $3 jr nz, .asm_143c9 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ret .asm_143c9 ld a, [$d604] @@ -25297,9 +25160,7 @@ Func_14377: ; 0x14377 add $12 .asm_143d6 ld [$ff8a], a - ld a, Bank(Func_30256) - ld hl, Func_30256 - call BankSwitch + callba Func_30256 ret Func_143e1: ; 0x143e1 @@ -25347,109 +25208,176 @@ Func_1441e: ; 0x1441e jp PinballCollideWithPoints Func_14439: ; 0x14439 - ld de, $45b5 + ld de, Data_145b5 ld bc, $d5fe scf jp Func_2775 Func_14443: ; 0x14443 - ld de, $45bb + ld de, Data_145bb ld bc, $d601 scf jp Func_2775 Func_1444d: ; 0x1444d - ld de, $45af - ld hl, $459d + ld de, Data_145af + ld hl, Data_1459d ld bc, $d5c7 and a jp Func_2775 Func_1445a: ; 0x1445a - ld de, $45c9 - ld hl, $45c1 + ld de, Data_145c9 + ld hl, Data_145c1 ld bc, $d60a and a jp Func_2775 Func_14467: ; 0x14467 - ld de, $44f4 - ld hl, $44ee + ld de, Data_144f4 + ld hl, Data_144ee ld bc, $d4ed and a jp Func_2775 Func_14474: ; 0x14474 - ld de, $4515 ; todo - ld hl, $44fd ; todo + ld de, Data_14515 ; todo + ld hl, Data_144fd ; todo ld bc, $d4cb and a jp Func_2775 Func_14481: ; 0x14481 - ld de, $452d - ld hl, $4521 + ld de, Data_1452d + ld hl, Data_14521 ld bc, $d4d8 and a jp Func_2775 Func_1448e: ; 0x1448e - ld de, $4536 + ld de, Data_14536 ld bc, $d4dc scf jp Func_2775 Func_14498: ; 0x14498 - ld de, $453c ; todo + ld de, Data_1453c ; todo ld bc, $d507 scf jp Func_2775 Func_144a2: ; 0x144a2 - ld de, $4542 + ld de, Data_14542 ld bc, $d50d scf jp Func_2775 Func_144ac: ; 0x144ac - ld de, $4551 + ld de, Data_14551 ld bc, $d5f7 scf jp Func_2775 Func_144b6: ; 0x144b6 - ld de, $455d ; todo + ld de, Data_1455d ; todo ld bc, $d51f scf jp Func_2775 Func_144c0: ; 0x144c0 - ld de, $457d ; todo - ld hl, $4578 ; todo + ld de, Data_1457d ; todo + ld hl, Data_14578 ; todo ld bc, $d500 and a jp Func_2775 Func_144cd: ; 0x144cd - ld de, $4588 - ld hl, $4583 + ld de, Data_14588 + ld hl, Data_14583 ld bc, $d500 and a jp Func_2775 Func_144da: ; 0x144da - ld de, $458e + ld de, Data_1458e ld bc, $d4fb scf jp Func_2775 Func_144e4: ; 0x144e4 - ld de, $4594 + ld de, Data_14594 ld bc, $d515 scf jp Func_2775 - dr $144ee, $145d2 +Data_144ee: + dr $144ee, $144f4 + +Data_144f4: + dr $144f4, $144fd + +Data_144fd: + dr $144fd, $14515 + +Data_14515: + dr $14515, $14521 + +Data_14521: + dr $14521, $1452d + +Data_1452d: + dr $1452d, $14536 + +Data_14536: + dr $14536, $1453c + +Data_1453c: + dr $1453c, $14542 + +Data_14542: + dr $14542, $14551 + +Data_14551: + dr $14551, $1455d + +Data_1455d: + dr $1455d, $14578 + +Data_14578: + dr $14578, $1457d + +Data_1457d: + dr $1457d, $14583 + +Data_14583: + dr $14583, $14588 + +Data_14588: + dr $14588, $1458e + +Data_1458e: + dr $1458e, $14594 + +Data_14594: + dr $14594, $1459d + +Data_1459d: + dr $1459d, $145af + +Data_145af: + dr $145af, $145b5 + +Data_145b5: + dr $145b5, $145bb + +Data_145bb: + dr $145bb, $145c1 + +Data_145c1: + dr $145c1, $145c9 + +Data_145c9: + dr $145c9, $145d2 RedStageEvolutionTrinketCoordinatePointers: ; 0x145d2 dw RedStageTopEvolutionTrinketCoords @@ -25503,14 +25431,10 @@ Func_1460e: ; 0x1460e call Func_174ea call Func_148cf ld [$ff8a], a - ld a, Bank(Func_30188) - ld hl, Func_30188 - call BankSwitch + callba Func_30188 ld a, $0 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret Func_14652: ; 0x14652 @@ -25534,14 +25458,10 @@ Func_14652: ; 0x14652 call Func_146a2 call Func_174d0 ld [$ff8a], a - ld a, Bank(Func_30188) - ld hl, Func_30188 - call BankSwitch + callba Func_30188 ld a, $0 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret Func_146a2: ; 0x146a2 @@ -25607,21 +25527,25 @@ Func_14707: ; 0x14707 ld a, [wBallSaverIconOn] and a jr nz, .asm_1471c - ld a, $5 - ld hl, $472b + ld a, BANK(Data_1172b) + ld hl, Data_1172b ld de, $99a8 ld bc, $0004 call Func_735 ret .asm_1471c - ld a, $5 - ld hl, $472f + ld a, BANK(Data_1472f) + ld hl, Data_1472f ld de, $99a8 ld bc, $0004 call Func_735 ret - dr $1472b, $14733 +Data_1172b: + dr $1472b, $1472f + +Data_1472f: + dr $1472f, $14733 Func_14733: ; 0x14733 ld c, $0 @@ -25645,15 +25569,16 @@ Func_14746: ; 0x14746 ld c, $2 .asm_14750 ld b, $0 - ld hl, $475f + ld hl, Data_1475f add hl, bc ld a, [hli] ld h, [hl] ld l, a - ld a, $5 + ld a, BANK(Data_1475f) call Func_10aa ret +Data_1475f: dr $1475f, $14795 Func_14795: ; 0x14795 @@ -25707,9 +25632,7 @@ Func_147aa: ; 0x147aa call Func_149f5 ld a, $8 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [wRightMapMoveCounter] cp $3 call z, Func_14920 @@ -25725,9 +25648,7 @@ Func_147aa: ; 0x147aa call Func_149f5 ld a, $7 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [wLeftMapMoveCounter] cp $3 call z, Func_14947 @@ -25887,9 +25808,7 @@ Func_14920: ; 0x14920 ld a, $1 ld [$d55a], a ld [$ff8a], a - ld a, Bank(StartMapMoveMode) - ld hl, StartMapMoveMode - call BankSwitch + callba StartMapMoveMode ret Func_14947: ; 0x14947 @@ -25906,9 +25825,7 @@ Func_14947: ; 0x14947 xor a ld [$d55a], a ld [$ff8a], a - ld a, Bank(StartMapMoveMode) - ld hl, StartMapMoveMode - call BankSwitch + callba StartMapMoveMode ret Func_1496d: ; 0x1496d @@ -25920,9 +25837,7 @@ Func_1496d: ; 0x1496d ld [$d7eb], a ld bc, $34be ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $000f call PlaySoundEffect ret @@ -25970,11 +25885,11 @@ Func_149d9: ; 0x149d9 sla a ld c, a ld b, $0 - ld hl, $4a11 ; todo + ld hl, Data_14a11 ld a, [hGameBoyColorFlag] and a jr z, .asm_149e9 - ld hl, $4a83 ; todo + ld hl, Data_14a83 .asm_149e9 add hl, bc ld a, [hli] @@ -25982,7 +25897,7 @@ Func_149d9: ; 0x149d9 ld l, a or h ret z - ld a, $5 + ld a, BANK(Data_14a11) call Func_10aa ret @@ -25990,11 +25905,11 @@ Func_149f5: ; 0x149f5 sla a ld c, a ld b, $0 - ld hl, $4af5 ; todo + ld hl, Data_14af5 ld a, [hGameBoyColorFlag] and a jr z, .asm_14a05 - ld hl, $4c8d ; todo + ld hl, Data_14c8d .asm_14a05 add hl, bc ld a, [hli] @@ -26002,11 +25917,21 @@ Func_149f5: ; 0x149f5 ld l, a or h ret z - ld a, $5 + ld a, BANK(Data_14af5) call Func_10aa ret - dr $14a11, $14d85 +Data_14a11: + dr $14a11, $14a83 + +Data_14a83: + dr $14a83, $14af5 + +Data_14af5: + dr $14af5, $14c8d + +Data_14c8d: + dr $14c8d, $14d85 Func_14d85: ; 0x14d85 ld a, [$d4cb] @@ -26022,14 +25947,10 @@ Func_14d85: ; 0x14d85 ld [$d4d7], a ld a, $4 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch - ld bc, $34be + callba Func_10000 + ld bc, Data_34be ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ret .asm_14db9 ld a, [$d4d6] @@ -26074,9 +25995,7 @@ Func_14dea: ; 0x14dea ld [$d50c], a ld a, $c ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ; fall through Func_14e10: ; 0x14e10 ld hl, $d50b @@ -26135,11 +26054,9 @@ Func_14e10: ; 0x14e10 ld a, c and a ret z - ld bc, $34ac + ld bc, Data_34ac ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, $d62d call Func_e4a ld a, [$d517] @@ -26170,7 +26087,7 @@ Func_14ea7: ; 0x14ea7 ld a, [$d517] ld c, a ld b, $0 - ld hl, $4ebe ; todo + ld hl, Data_14ebe add hl, bc ld a, [hl] ld e, a @@ -26178,6 +26095,7 @@ Func_14ea7: ; 0x14ea7 call PlaySoundEffect ret +Data_14ebe: dr $14ebe, $14ece Func_14ece: ; 0x14ece @@ -26185,21 +26103,25 @@ Func_14ece: ; 0x14ece ld c, a sla c ld b, $0 - ld hl, $4eeb ; todo + ld hl, Data_14eeb ld a, [hGameBoyColorFlag] and a jr z, .asm_14ee1 - ld hl, $509b + ld hl, Data_1509b .asm_14ee1 add hl, bc ld a, [hli] ld h, [hl] ld l, a - ld a, $5 + ld a, BANK(Data_14eeb) call Func_10aa ret - dr $14eeb, $151cb +Data_14eeb: + dr $14eeb, $1509b + +Data_1509b: + dr $1509b, $151cb Func_151cb: ; 0x151cb ld a, [$d50d] @@ -26220,11 +26142,9 @@ Func_151cb: ; 0x151cb ld [hl], $1 and a ret nz - ld bc, $34b2 + ld bc, Data_34b2 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, $d50f ld a, [hli] and [hl] @@ -26237,11 +26157,9 @@ Func_151cb: ; 0x151cb ld [$d513], a ld a, $80 ld [$d514], a - ld bc, $34b8 + ld bc, Data_34b8 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $0009 call PlaySoundEffect ld hl, $d62c @@ -26395,9 +26313,7 @@ Func_1535d: ; 0x1535d call Func_159c9 ld a, $b ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [$d5f8] sub $e ld c, a @@ -26410,9 +26326,7 @@ Func_1535d: ; 0x1535d ret nz ld bc, $34b2 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, $d5f9 ld a, [hli] and [hl] @@ -26434,9 +26348,7 @@ Func_1535d: ; 0x1535d ld [wBallTypeCounter + 1], a ld bc, $34b8 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [wBallType] cp MASTER_BALL jr z, .masterBall @@ -26462,9 +26374,7 @@ Func_1535d: ; 0x1535d call PlaySoundEffect ld bc, $34e8 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0100 ld de, $0000 push bc @@ -26712,9 +26622,7 @@ Func_1581f: ; 0x1581f ld [$d51f], a ld bc, $34a6 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [$d520] sub $11 ld c, a @@ -26758,9 +26666,7 @@ Func_1587c: ; 0x1587c ld [wLeftAlleyTrigger], a ld a, $1 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret c ld a, [wLeftAlleyCount] cp $3 @@ -26776,9 +26682,7 @@ Func_1587c: ; 0x1587c or $6 ld [wStageCollisionState], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_159f4 ret @@ -26792,9 +26696,7 @@ Func_158c0: ; 0x158c0 ld [wLeftAlleyTrigger], a ld a, $1 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret c ld a, [wLeftAlleyCount] cp $3 @@ -26810,9 +26712,7 @@ Func_158c0: ; 0x158c0 or $6 ld [wStageCollisionState], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_159f4 ret @@ -26826,9 +26726,7 @@ Func_15904: ; 0x15904 ld [wSecondaryLeftAlleyTrigger], a ld a, $3 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret HandleLeftAlleyTriggerRedField: ; 0x1591e @@ -26862,9 +26760,7 @@ Func_15944: ; 0x15944 ld [wRightAlleyTrigger], a ld a, $2 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret c ld a, [wRightAlleyCount] cp $3 @@ -26904,9 +26800,7 @@ Func_15990: ; 0x15990 ld [wRightAlleyTrigger], a ld a, $2 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret c ld a, [wRightAlleyCount] cp $3 @@ -26937,9 +26831,7 @@ Func_159c9: ; 0x159c9 ld a, $ff ld [$d7ad], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_159f4 ld a, $1 ld [$d580], a @@ -26999,9 +26891,7 @@ Func_15e93: ; 0x15e93 ld [$d4fb], a ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $0005 call PlaySoundEffect ld hl, BellsproutAnimationData @@ -27051,9 +26941,7 @@ Func_15e93: ; 0x15e93 .asm_15f11 ld [wRareMonsFlag], a ld [$ff8a], a - ld a, Bank(StartCatchEmMode) - ld hl, StartCatchEmMode - call BankSwitch + callba StartCatchEmMode .noCatchEmMode ld hl, $d62a call Func_e4a @@ -27086,9 +26974,7 @@ Func_15e93: ; 0x15e93 call PlaySoundEffect ld a, $5 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret BellsproutAnimationData: ; 0x15f69 @@ -27195,9 +27081,7 @@ Func_160f0: ; 0x160f0 ld [$d5fe], a ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $0021 call PlaySoundEffect xor a @@ -27228,17 +27112,13 @@ Func_160f0: ; 0x160f0 cp $f jr nz, .asm_1614f ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx ret .asm_1614f cp $c jr nz, .asm_1615e ld [$ff8a], a - ld a, Bank(Func_dd62) - ld hl, Func_dd62 - call BankSwitch + callba Func_dd62 ret .asm_1615e cp $9 @@ -27252,9 +27132,7 @@ Func_160f0: ; 0x160f0 cp $6 jr nz, .asm_1618e ld [$ff8a], a - ld a, Bank(Func_10ab3) - ld hl, Func_10ab3 - call BankSwitch + callba Func_10ab3 ld a, $1 ld [$d548], a ld [$d549], a @@ -27267,17 +27145,13 @@ Func_160f0: ; 0x160f0 cp $3 jr nz, .asm_1619d ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx ret .asm_1619d and a ret nz ld [$ff8a], a - ld a, Bank(LoadBallGfx) - ld hl, LoadBallGfx - call BankSwitch + callba LoadBallGfx ld a, $2 ld [wBallYVelocity + 1], a ret @@ -27456,17 +27330,13 @@ Func_16279: ; 0x16279 ld de, $0021 call PlaySoundEffect ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx ret .asm_162d4 cp $f jr nz, .asm_162e3 ld [$ff8a], a - ld a, Bank(Func_dd62) - ld hl, Func_dd62 - call BankSwitch + callba Func_dd62 ret .asm_162e3 cp $c @@ -27491,17 +27361,13 @@ Func_16279: ; 0x16279 ld a, $8 ld [$d804], a ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx ret .asm_16317 cp $3 jr nz, .asm_16330 ld [$ff8a], a - ld a, Bank(LoadBallGfx) - ld hl, LoadBallGfx - call BankSwitch + callba LoadBallGfx ld a, $2 ld [wBallYVelocity + 1], a ld a, $80 @@ -27518,9 +27384,7 @@ Func_16279: ; 0x16279 and $8 ld [wRareMonsFlag], a ld [$ff8a], a - ld a, Bank(StartCatchEmMode) - ld hl, StartCatchEmMode - call BankSwitch + callba StartCatchEmMode xor a ld [$d622], a ret @@ -27530,9 +27394,7 @@ Func_16352: ; 0x16352 ld [wIndicatorStates + 4], a ld a, $d ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 jr nc, .asm_1636d ld a, $1 ld [$d548], a @@ -27575,9 +27437,7 @@ Func_16352: ; 0x16352 ret .asm_163b3 ld [$ff8a], a - ld a, Bank(Func_ed8e) - ld hl, Func_ed8e - call BankSwitch + callba Func_ed8e xor a ld [$d608], a ld a, [$d61d] @@ -27590,9 +27450,7 @@ Func_16352: ; 0x16352 cp $2 ret nz ld [$ff8a], a - ld a, Bank(Func_10ab3) - ld hl, Func_10ab3 - call BankSwitch + callba Func_10ab3 ld a, [$d7ad] ld c, a ld a, [wStageCollisionState] @@ -27619,7 +27477,7 @@ Func_163f2: ; 0x163f2 call Func_32aa ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $3c23 call PlaySoundEffect ret @@ -27769,16 +27627,12 @@ Func_1658f: ; 0x1658f pop af add $29 ; map billboard pictures start at the $29th entry in BillboardPicturePointers ld [$ff8a], a - ld a, Bank(LoadBillboardPicture) - ld hl, LoadBillboardPicture - call BankSwitch + callba LoadBillboardPicture ld b, $20 ; number of frames to delay before the next map is shown .waitOnCurrentMap push bc ld [$ff8a], a - ld a, Bank(Func_eeee) - ld hl, Func_eeee - call BankSwitch + callba Func_eeee ld hl, wKeyConfigBallStart call IsKeyPressed jr nz, .ballStartKeyPressed @@ -27789,14 +27643,10 @@ Func_1658f: ; 0x1658f .ballStartKeyPressed pop bc ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ld bc, $2cd1 ld [$ff8a], a - ld a, Bank(Func_3118f) - ld hl, Func_3118f - call BankSwitch + callba Func_3118f ld a, [wCurrentMap] ld [$d4e3], a xor a @@ -27895,12 +27745,10 @@ Func_1669e: ; 0x1669e xor a ld [$d85d], a call Func_310a - rst $10 + rst AdvanceFrame ld a, $1 ld [$ff8a], a - ld a, Bank(PlayPikachuSoundClip) - ld hl, PlayPikachuSoundClip - call BankSwitch + callba PlayPikachuSoundClip ld a, $1 ld [$d85d], a ld a, $ff @@ -27930,9 +27778,7 @@ Func_1669e: ; 0x1669e ld [$d549], a ld bc, $34ca ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore xor a ld [$d51c], a ret @@ -28010,9 +27856,7 @@ Func_16781: ; 0x16781 jr nz, .asm_167c2 ld bc, $34ca ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [$d502] xor $1 set 1, a @@ -28022,9 +27866,7 @@ Func_16781: ; 0x16781 call Func_16859 ld a, $6 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret .asm_167bd ld a, [$d503] @@ -28046,9 +27888,7 @@ Func_16781: ; 0x16781 or c ld [wStageCollisionState], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_159f4 ld de, $0007 call PlaySoundEffect @@ -28068,9 +27908,7 @@ Func_167ff: ; 0x167ff jr nz, .asm_1683e ld bc, $34ca ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [$d502] xor $1 ld [$d502], a @@ -28079,9 +27917,7 @@ Func_167ff: ; 0x167ff call Func_16878 ld a, $6 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret .asm_16839 ld a, [$d503] @@ -28213,9 +28049,7 @@ Func_16d9d: ; 016d9d jr nz, .asm_16ddc ld a, $9 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [$d610] cp $3 jr nz, .asm_16e35 @@ -28230,9 +28064,7 @@ Func_16d9d: ; 016d9d .asm_16ddc ld a, $a ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [$d611] cp $3 jr nz, .asm_16e35 @@ -28269,9 +28101,7 @@ Func_16d9d: ; 016d9d .asm_16e35 ld bc, $34ac ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [$d60c] call Func_16f28 ld a, [$d60d] @@ -28573,9 +28403,7 @@ Func_1757e: ; 0x1757e call Func_17c96 call Func_17e08 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 call Func_17e81 call Func_17f0f call Func_17f75 @@ -29184,9 +29012,7 @@ Func_18000: ; 0x18000 ld a, $3 ld [$d49e], a ld [$ff8a], a - ld a, Bank(Func_dbba) - ld hl, Func_dbba - call BankSwitch + callba Func_dbba ret Func_1804a: ; 0x1804a @@ -29211,9 +29037,7 @@ Func_18061: ; 0x18061 Func_18062: ; 0x18062 ld [$ff8a], a - ld a, Bank(Func_1448e) - ld hl, Func_1448e - call BankSwitch + callba Func_1448e ret Func_1806d: ; 0x1806d @@ -29221,27 +29045,19 @@ Func_1806d: ; 0x1806d Func_1806e: ; 0x1806e ld [$ff8a], a - ld a, Bank(Func_1652d) - ld hl, Func_1652d - call BankSwitch + callba Func_1652d ret Func_18079: ; 0x18079 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 ret Func_18084: ; 0x18084 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 ret InitGengarBonusStage: ; 0x18099 @@ -29289,9 +29105,7 @@ InitGengarBonusStage: ; 0x18099 ld [$d656], a ld bc, $0130 ; 1 minute 30 seconds ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld a, $f call SetSongBank ld de, $0005 @@ -29343,16 +29157,12 @@ StartBallGengarBonusStage: ; 0x18157 Func_1818b: ; 0x1818b ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc call Func_2862 call Func_18d72 ld a, [$d7c1] ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a and a ret z call Func_183db @@ -29603,9 +29413,7 @@ Func_18377: ; 0x18377 call Func_18d34 call Func_183b7 ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -29615,9 +29423,7 @@ Func_18377: ; 0x18377 ld [$d7be], a call Func_2862 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, [$d6a2] cp $5 ret nc @@ -29636,9 +29442,7 @@ Func_183b7: ; 0x183b7 ld [wStageCollisionState], a ld [$d653], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_183db call Func_18d91 ret @@ -29706,9 +29510,7 @@ Func_18464: ; 0x18464 ld [$d67b], a ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld a, $33 ld [$d803], a ld a, $8 @@ -29917,9 +29719,7 @@ Func_1860b: ; 0x1860b ld [$d695], a ld bc, $34e2 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld a, $33 ld [$d803], a ld a, $8 @@ -30141,17 +29941,13 @@ Func_187b1: ; 0x187b1 ld [$d7be], a call Func_2862 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld de, $0000 call PlaySong .asm_18826 ld bc, $34ee ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld a, $33 ld [$d803], a ld a, $8 @@ -30460,9 +30256,7 @@ Func_18d34: ; 0x18d34 jr nz, .asm_18d71 ld bc, $34b2 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld a, $ff ld [$d803], a ld a, $3 @@ -30544,20 +30338,14 @@ Func_18db2: ; 0x18db2 Func_18faf: ; 0x18faf ld bc, $7f00 ld [$ff8a], a - ld a, Bank(Func_175a4) - ld hl, Func_175a4 - call BankSwitch + callba Func_175a4 call Func_19020 call Func_190b9 call Func_19185 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 ret dr $18fda, $19020 @@ -30885,9 +30673,7 @@ InitMewtwoBonusStage: ; 0x1924f jr nz, .asm_1928c ld bc, $0200 ; 2 minutes 0 seconds ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld a, $12 call SetSongBank ld de, $0001 @@ -30920,14 +30706,10 @@ StartBallMewtwoBonusStage: ; 0x192e3 Func_19310: ; 0x19310 ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc call Func_2862 ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a ld a, [$d7c1] and a ret z @@ -31127,9 +30909,7 @@ Func_19451: ; 0x19451 call Func_19701 call Func_1948b ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -31139,9 +30919,7 @@ Func_19451: ; 0x19451 ld [$d7be], a call Func_2862 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, [$d6b1] cp $8 ret nc @@ -31160,9 +30938,7 @@ Func_1948b: ; 0x1948b ld [wStageCollisionState], a ld [$d6a9], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_194ac ret @@ -31201,9 +30977,7 @@ Func_19531: ; 0x19531 jr nc, .asm_195a2 ld bc, $34ee ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld a, [$d6b0] inc a cp $3 @@ -31232,9 +31006,7 @@ Func_19531: ; 0x19531 ld [$d7be], a call Func_2862 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld de, $0000 call PlaySong .asm_195a2 @@ -31314,7 +31086,7 @@ Func_195f5: ; 0x195f5 pop de ret nc ld a, [de] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_1960d: ; 0x1960d dw Func_19615 dw Func_1961e @@ -31433,9 +31205,7 @@ Func_19701: ; 0x19701 call Func_19876 ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld de, $0038 call PlaySoundEffect .asm_19742 @@ -31513,7 +31283,7 @@ Func_19833: ; 0x19833 pop de ret nc ld a, [de] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_19852: ; 0x19852 dw Func_1985a dw Func_19863 @@ -31622,18 +31392,12 @@ Func_1988e: ; 0x1988e Func_1994e: ; 0x1994e ld bc, $7f65 ld [$ff8a], a - ld a, Bank(Func_175a4) - ld hl, Func_175a4 - call BankSwitch + callba Func_175a4 call Func_1999d ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 call Func_19976 ret @@ -31776,9 +31540,7 @@ StartBallDiglettBonusStage: ; 0x19a38 Func_19a76: ; 0x19a76 ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc call Func_2862 ld a, [$d7c1] and a @@ -31965,9 +31727,7 @@ Func_19c52: ; 0x19c52 ld [$d73b], a ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld de, $0035 call PlaySoundEffect ld hl, $0100 @@ -32272,9 +32032,7 @@ Func_1aad4: ; 0x1aad4 call CopyHLToDE ld bc, $34ee ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld de, $0036 call PlaySoundEffect ld a, $33 @@ -32443,13 +32201,9 @@ asm_1ac2f: Func_1ac98: ; 0x1ac98 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 call Func_1acb0 ret @@ -32526,13 +32280,9 @@ InitBlueField: ; 0x1c000 ld [$d645], a ld [$d646], a ld [$ff8a], a - ld a, Bank(Func_dbba) - ld hl, Func_dbba - call BankSwitch + callba Func_dbba ld [$ff8a], a - ld a, Bank(Func_1d65f) - ld hl, Func_1d65f - call BankSwitch + callba Func_1d65f ld a, $10 call SetSongBank ld de, $0001 @@ -32636,16 +32386,12 @@ Func_1c165: ; 0x1c165 call Func_1c3ee call Func_1e8f6 ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc ld a, $1 ld [$d640], a call Func_1f18a ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a call Func_1c203 ret @@ -32658,24 +32404,16 @@ Func_1c191: ; 0x1c191 call Func_1c305 call Func_1c3ee ld [$ff8a], a - ld a, Bank(Func_14746) - ld hl, Func_14746 - call BankSwitch + callba Func_14746 ld [$ff8a], a - ld a, Bank(Func_14707) - ld hl, Func_14707 - call BankSwitch + callba Func_14707 call Func_1c235 call Func_1c21e call Func_1e8f6 ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a call Func_1c203 ret @@ -32863,13 +32601,9 @@ Func_1c305: ; 0x1c305 jp Func_1c3ca .asm_1c31f ld [$ff8a], a - ld a, Bank(Func_1c3ac) - ld hl, Func_1c3ac - call BankSwitch + callba Func_1c3ac ld [$ff8a], a - ld a, Bank(Func_10362) - ld hl, Func_10362 - call BankSwitch + callba Func_10362 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -32954,9 +32688,7 @@ Func_1c3ca: ; 0x1c3ca dec b jr nz, .asm_1c3cf ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -33033,9 +32765,7 @@ Func_1c43c: ; 0x1c43c Func_1c46d: ; 0x1c46d push af ld [$ff8a], a - ld a, Bank(Func_10611) - ld hl, Func_10611 - call BankSwitch + callba Func_10611 pop af dec a jr nz, Func_1c46d @@ -33090,9 +32820,7 @@ Func_1c4b6: ; 0x1c4b6 ld a, [$d498] add $15 ld [$ff8a], a - ld a, Bank(Func_30256) - ld hl, Func_30256 - call BankSwitch + callba Func_30256 ret .asm_1c4d2 ld a, [$d608] @@ -33100,15 +32828,11 @@ Func_1c4b6: ; 0x1c4b6 jr z, .asm_1c4e5 ld a, $1a ld [$ff8a], a - ld a, Bank(Func_30256) - ld hl, Func_30256 - call BankSwitch + callba Func_30256 ret .asm_1c4e5 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ret .asm_1c4f0 ld a, [wSpecialMode] @@ -33118,9 +32842,7 @@ Func_1c4b6: ; 0x1c4b6 cp $3 jr nz, .asm_1c508 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ret .asm_1c508 ld a, [$d604] @@ -33131,9 +32853,7 @@ Func_1c4b6: ; 0x1c4b6 add $12 .asm_1c515 ld [$ff8a], a - ld a, Bank(Func_30256) - ld hl, Func_30256 - call BankSwitch + callba Func_30256 ret Func_1c520: ; 0x1c520 @@ -33318,20 +33038,14 @@ Func_1c715: ; 0x1c715 call Func_1c8b6 call Func_1f18a ld [$ff8a], a - ld a, Bank(Func_146a9) - ld hl, Func_146a9 - call BankSwitch + callba Func_146a9 call Func_1f27b call Func_1df15 ld [$ff8a], a - ld a, Bank(Func_30188) - ld hl, Func_30188 - call BankSwitch + callba Func_30188 ld a, $0 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret Func_1c769: ; 0x1c769 @@ -33351,33 +33065,23 @@ Func_1c769: ; 0x1c769 call Func_1ea0a call Func_1c8b6 ld [$ff8a], a - ld a, Bank(Func_14733) - ld hl, Func_14733 - call BankSwitch + callba Func_14733 ld [$ff8a], a - ld a, Bank(Func_146a2) - ld hl, Func_146a2 - call BankSwitch + callba Func_146a2 call Func_1f261 call Func_1de93 ld [$ff8a], a - ld a, Bank(Func_30188) - ld hl, Func_30188 - call BankSwitch + callba Func_30188 ld a, $0 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret Func_1c7c7: ; 0x1c7c7 ld a, $0 ld [wStageCollisionState], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes ret Func_1c7d7: ; 0x1c7d7 @@ -33455,16 +33159,12 @@ Func_1c839: ; 0x1c839 pop af add $29 ; map billboard pictures start at the $29th entry in BillboardPicturePointers ld [$ff8a], a - ld a, Bank(LoadBillboardPicture) - ld hl, LoadBillboardPicture - call BankSwitch + callba LoadBillboardPicture ld b, $20 ; number of frames to delay before the next map is shown .waitOnCurrentMap push bc ld [$ff8a], a - ld a, Bank(Func_eeee) - ld hl, Func_eeee - call BankSwitch + callba Func_eeee ld hl, wKeyConfigBallStart call IsKeyPressed jr nz, .ballStartKeyPressed @@ -33475,14 +33175,10 @@ Func_1c839: ; 0x1c839 .ballStartKeyPressed pop bc ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ld bc, $2cd1 ld [$ff8a], a - ld a, Bank(Func_3118f) - ld hl, Func_3118f - call BankSwitch + callba Func_3118f ld a, [wCurrentMap] ld [$d4e3], a xor a @@ -33668,14 +33364,10 @@ Func_1c9c1: ; 0x1c9c1 ld [$d4d7], a ld a, $4 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld bc, $34be ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ret .asm_1ca19 ld a, [$d4d6] @@ -33732,9 +33424,7 @@ Func_1ca5f: ; 0x1ca5f ld [$d50c], a ld a, $c ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ; fall through Func_1ca85: ; 0x1ca85 @@ -33796,9 +33486,7 @@ Func_1ca85: ; 0x1ca85 ret z ld bc, $34ac ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, $d62d call Func_e4a ld a, [$d517] @@ -33946,24 +33634,18 @@ Func_1cfaa: ; 0x1cfaa ld [$d51f], a ld bc, $34a6 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [wStageCollisionState] cp $0 jr nz, .asm_1cfe5 ld a, $1 ld [wStageCollisionState], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes ld a, $1 ld [$d580], a ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a .asm_1cfe5 ld a, [$d520] sub $7 @@ -33996,9 +33678,7 @@ Func_1d010: ; 0x1d010 ld [wLeftAlleyTrigger], a ld a, $1 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret c ld a, [wLeftAlleyCount] cp $3 @@ -34026,9 +33706,7 @@ Func_1d047: ; 0x1d047 ld [wRightAlleyTrigger], a ld a, $2 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ret c ld a, [wRightAlleyCount] cp $3 @@ -34151,12 +33829,10 @@ Func_1d133: ; 0x1d133 xor a ld [$d85d], a call Func_310a - rst $10 + rst AdvanceFrame ld a, $1 ld [$ff8a], a - ld a, Bank(PlayPikachuSoundClip) - ld hl, PlayPikachuSoundClip - call BankSwitch + callba PlayPikachuSoundClip ld a, $1 ld [$d85d], a ld a, $ff @@ -34186,9 +33862,7 @@ Func_1d133: ; 0x1d133 ld [$d549], a ld bc, $34ca ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore xor a ld [$d51c], a ret @@ -34263,9 +33937,7 @@ Func_1d216: ; 0x1d216 ld [$d630], a ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $0005 call PlaySoundEffect ld hl, $5312 ; todo @@ -34306,9 +33978,7 @@ Func_1d216: ; 0x1d216 cp $3 jr nz, .asm_1d299 ld [$ff8a], a - ld a, Bank(Func_10ab3) - ld hl, Func_10ab3 - call BankSwitch + callba Func_10ab3 ld a, [$d643] and a ret z @@ -34354,9 +34024,7 @@ Func_1d216: ; 0x1d216 jr nz, .asm_1d2f8 ld a, $f ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 .asm_1d2f8 xor a ld [$d642], a @@ -34380,9 +34048,7 @@ HandleEnteringCloyster: ; 0x1d32d ld [$d635], a ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $0005 call PlaySoundEffect ld hl, $541d @@ -34428,9 +34094,7 @@ HandleEnteringCloyster: ; 0x1d32d .asm_1d3a1 ld [wRareMonsFlag], a ld [$ff8a], a - ld a, Bank(StartCatchEmMode) - ld hl, StartCatchEmMode - call BankSwitch + callba StartCatchEmMode .noCatchEmMode ld hl, $d63b call Func_e4a @@ -34468,9 +34132,7 @@ HandleEnteringCloyster: ; 0x1d32d call PlaySoundEffect ld a, $e ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 xor a ld [$d64c], a ld [$d64d], a @@ -34509,9 +34171,7 @@ Func_1d438: ; 0x1d438 ld [$d647], a ld a, $9 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [$d610] cp $3 jp nz, asm_1d4fa @@ -34537,9 +34197,7 @@ Func_1d438: ; 0x1d438 ld [$d647], a ld a, $a ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [$d611] cp $3 jr nz, asm_1d4fa @@ -34576,9 +34234,7 @@ Func_1d438: ; 0x1d438 asm_1d4fa: ; 0x1d4fa ld bc, $34ac ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [$d60c] call Func_1d5f2 ld a, [$d60d] @@ -34866,9 +34522,7 @@ Func_1dbd2: ; 0x1dbd2 cp $3 ld a, $7 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, $2 ld [$d646], a ld a, $78 @@ -34904,9 +34558,7 @@ Func_1dbd2: ; 0x1dbd2 cp $3 ld a, $8 ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [wRightMapMoveCounter] cp $3 ccf @@ -35105,9 +34757,7 @@ Func_1ddc7: ; 0x1ddc7 xor a ld [$d55a], a ld [$ff8a], a - ld a, Bank(StartMapMoveMode) - ld hl, StartMapMoveMode - call BankSwitch + callba StartMapMoveMode scf ret @@ -35127,9 +34777,7 @@ Func_1ddf4: ; 0x1ddf4 ld a, $1 ld [$d55a], a ld [$ff8a], a - ld a, Bank(StartMapMoveMode) - ld hl, StartMapMoveMode - call BankSwitch + callba StartMapMoveMode scf ret @@ -35145,9 +34793,7 @@ Func_1de22: ; 0x1de22 ld [$d7eb], a ld bc, $34be ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $000f call PlaySoundEffect ret @@ -35348,15 +34994,11 @@ Func_1e356: ; 0x1e356 ld a, $1 ld [wStageCollisionState], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes ld a, $1 ld [$d580], a ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a .asm_1e386 ld a, [wStageCollisionState] bit 0, a @@ -35370,9 +35012,7 @@ Func_1e356: ; 0x1e356 ld [wSecondaryLeftAlleyTrigger], a ld a, $b ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 ld a, [$d5f8] sub $13 ld c, a @@ -35387,9 +35027,7 @@ Func_1e356: ; 0x1e356 .asm_1e3bf ld bc, $34b2 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, $d5f9 ld a, [hli] and [hl] @@ -35411,9 +35049,7 @@ Func_1e356: ; 0x1e356 ld [wBallTypeCounter + 1], a ld bc, $34b8 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld a, [wBallType] cp MASTER_BALL jr z, .masterBall @@ -35439,9 +35075,7 @@ Func_1e356: ; 0x1e356 call PlaySoundEffect ld bc, $34e8 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0100 ld de, $0000 push bc @@ -35458,9 +35092,7 @@ Func_1e356: ; 0x1e356 call Func_32aa .asm_1e465 ld [$ff8a], a - ld a, Bank(Func_155a7) - ld hl, Func_155a7 - call BankSwitch + callba Func_155a7 jr asm_1e475 Func_1e471: ; 0x1e471 @@ -35633,9 +35265,7 @@ HandleBallTypeUpgradeCounterBlueField: ; 0x1e58c ld [wBallTypeCounter + 1], a .pokeball ld [$ff8a], a - ld a, Bank(Func_155a7) - ld hl, Func_155a7 - call BankSwitch + callba Func_155a7 ret Func_1e5c5: ; 0x1e5c5 @@ -35659,9 +35289,7 @@ Func_1e5c5: ; 0x1e5c5 ret nz ld bc, $34b2 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, $d50f ld a, [hli] and [hl] @@ -35676,9 +35304,7 @@ Func_1e5c5: ; 0x1e5c5 ld [$d514], a ld bc, $34b8 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld de, $0009 call PlaySoundEffect ld hl, $d62c @@ -35854,17 +35480,13 @@ Func_1e757: ; 0x1e757 ld de, $0021 call PlaySoundEffect ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx ret .asm_1e7b2 cp $f jr nz, .asm_1e7c1 ld [$ff8a], a - ld a, Bank(Func_dd62) - ld hl, Func_dd62 - call BankSwitch + callba Func_dd62 ret .asm_1e7c1 cp $c @@ -35889,17 +35511,13 @@ Func_1e757: ; 0x1e757 ld a, $8 ld [$d804], a ld [$ff8a], a - ld a, Bank(LoadMiniBallGfx) - ld hl, LoadMiniBallGfx - call BankSwitch + callba LoadMiniBallGfx ret .asm_1e7f5 cp $3 jr nz, .asm_1e80e ld [$ff8a], a - ld a, Bank(LoadBallGfx) - ld hl, LoadBallGfx - call BankSwitch + callba LoadBallGfx ld a, $2 ld [wBallYVelocity + 1], a ld a, $80 @@ -35916,9 +35534,7 @@ Func_1e757: ; 0x1e757 and $8 ld [wRareMonsFlag], a ld [$ff8a], a - ld a, Bank(StartCatchEmMode) - ld hl, StartCatchEmMode - call BankSwitch + callba StartCatchEmMode xor a ld [$d622], a ret @@ -35928,9 +35544,7 @@ Func_1e830: ; 0x1e830 ld [wIndicatorStates + 4], a ld a, $d ld [$ff8a], a - ld a, Bank(Func_10000) - ld hl, Func_10000 - call BankSwitch + callba Func_10000 jr nc, .asm_1e84b ld a, $1 ld [$d548], a @@ -35973,9 +35587,7 @@ Func_1e830: ; 0x1e830 ret .asm_1e891 ld [$ff8a], a - ld a, Bank(Func_ed8e) - ld hl, Func_ed8e - call BankSwitch + callba Func_ed8e xor a ld [$d608], a ld a, [$d61d] @@ -35988,9 +35600,7 @@ Func_1e830: ; 0x1e830 cp $2 ret nz ld [$ff8a], a - ld a, Bank(Func_10ab3) - ld hl, Func_10ab3 - call BankSwitch + callba Func_10ab3 xor a ld [$d622], a ret @@ -36011,7 +35621,7 @@ Func_1e8c3: ; 0x1e8c3 call Func_32aa ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $3c23 call PlaySoundEffect ret @@ -36887,17 +36497,13 @@ Func_1f2ff: ; 0x1f2ff Func_1f330: ; 0x1f330 ld bc, $7f00 ld [$ff8a], a - ld a, Bank(Func_175a4) - ld hl, Func_175a4 - call BankSwitch + callba Func_175a4 call Func_1f395 call Func_1f3e1 call Func_1f408 call Func_1f428 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 call Func_1f48f call Func_1f4f8 ret @@ -36905,23 +36511,15 @@ Func_1f330: ; 0x1f330 Func_1f35a: ; 0x1f35a ld bc, $7f00 ld [$ff8a], a - ld a, Bank(Func_175a4) - ld hl, Func_175a4 - call BankSwitch + callba Func_175a4 ld [$ff8a], a - ld a, Bank(Func_17c67) - ld hl, Func_17c67 - call BankSwitch + callba Func_17c67 call Func_1f58b call Func_1f448 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 call Func_1f4a3 call Func_1f509 call Func_1f55e @@ -37278,9 +36876,7 @@ Func_20041: ; 0x20041 Func_2005f: ; 0x2005f ld [$ff8a], a - ld a, Bank(Func_10648) - ld hl, Func_10648 - call BankSwitch + callba Func_10648 scf ret @@ -37291,13 +36887,9 @@ Func_2006b: ; 0x2006b call Func_1130 jr nz, .asm_200a1 ld [$ff8a], a - ld a, Bank(Func_10414) - ld hl, Func_10414 - call BankSwitch + callba Func_10414 ld [$ff8a], a - ld a, Bank(Func_10362) - ld hl, Func_10362 - call BankSwitch + callba Func_10362 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -37321,17 +36913,11 @@ Func_200a3: ; 0x200a3 jr nz, .asm_200d1 .asm_200af ld [$ff8a], a - ld a, Bank(Func_10678) - ld hl, Func_10678 - call BankSwitch + callba Func_10678 ld [$ff8a], a - ld a, Bank(Func_10732) - ld hl, Func_10732 - call BankSwitch + callba Func_10732 ld [$ff8a], a - ld a, Bank(Func_10464) - ld hl, Func_10464 - call BankSwitch + callba Func_10464 ld hl, $d54d inc [hl] .asm_200d1 @@ -37374,9 +36960,7 @@ Func_200d3: ; 0x200d3 .asm_20116 ld bc, $34dc ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0030 ld de, $0000 push bc @@ -37393,9 +36977,7 @@ Func_200d3: ; 0x200d3 call Func_3357 ld a, [wNumMonHits] ld [$ff8a], a - ld a, Bank(Func_10611) - ld hl, Func_10611 - call BankSwitch + callba Func_10611 ld c, $2 jr .asm_2018a .hitMonThreeTimes @@ -37443,27 +37025,19 @@ Func_20193: ; 0x20193 ret .asm_2019e ld [$ff8a], a - ld a, Bank(Func_10496) - ld hl, Func_10496 - call BankSwitch + callba Func_10496 ld hl, $d54d inc [hl] ld [$ff8a], a - ld a, Bank(Func_106b6) - ld hl, Func_106b6 - call BankSwitch + callba Func_106b6 ld [$ff8a], a - ld a, Bank(AddCaughtPokemonToParty) - ld hl, AddCaughtPokemonToParty - call BankSwitch + callba AddCaughtPokemonToParty scf ret CapturePokemonRedStage: ; 0x201c2 ld [$ff8a], a - ld a, Bank(CapturePokemon) - ld hl, CapturePokemon - call BankSwitch + callba CapturePokemon scf ret @@ -37473,13 +37047,9 @@ Func_201ce: ; 0x201ce ret nz call Func_30e8 ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 ld [$ff8a], a - ld a, Bank(Func_10157) - ld hl, Func_10157 - call BankSwitch + callba Func_10157 ld de, $0001 call PlaySong scf @@ -37487,9 +37057,7 @@ Func_201ce: ; 0x201ce Func_201f2: ; 0x201f2 ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -37501,18 +37069,12 @@ Func_201f2: ; 0x201f2 cp NUM_POKEMON - 1 jr nz, .asm_2021b ld [$ff8a], a - ld a, Bank(SetPokemonOwnedFlag) - ld hl, SetPokemonOwnedFlag - call BankSwitch + callba SetPokemonOwnedFlag .asm_2021b ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld [$ff8a], a - ld a, Bank(Func_106a6) - ld hl, Func_106a6 - call BankSwitch + callba Func_106a6 ret Func_20230: ; 0x20230 @@ -37548,14 +37110,10 @@ Func_20230: ; 0x20230 ld [wIndicatorStates + 9], a .asm_20264 ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0010 ld de, $0000 push bc @@ -37651,9 +37209,7 @@ Func_20302: ; 0x20302 Func_20320: ; 0x20320 ld [$ff8a], a - ld a, Bank(Func_10648) - ld hl, Func_10648 - call BankSwitch + callba Func_10648 scf ret @@ -37664,13 +37220,9 @@ Func_2032c: ; 0x2032c call Func_1130 jr nz, .asm_20362 ld [$ff8a], a - ld a, Bank(Func_10414) - ld hl, Func_10414 - call BankSwitch + callba Func_10414 ld [$ff8a], a - ld a, Bank(Func_10362) - ld hl, Func_10362 - call BankSwitch + callba Func_10362 ld a, [hGameBoyColorFlag] and a ld [$ff8a], a @@ -37694,17 +37246,11 @@ Func_20364: ; 0x20364 jr nz, .asm_20392 .asm_20370 ld [$ff8a], a - ld a, Bank(Func_10678) - ld hl, Func_10678 - call BankSwitch + callba Func_10678 ld [$ff8a], a - ld a, Bank(Func_10732) - ld hl, Func_10732 - call BankSwitch + callba Func_10732 ld [$ff8a], a - ld a, Bank(Func_10464) - ld hl, Func_10464 - call BankSwitch + callba Func_10464 ld hl, $d54d inc [hl] .asm_20392 @@ -37747,9 +37293,7 @@ Func_20394: ; 0x20394 .asm_203d7 ld bc, $34dc ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0030 ld de, $0000 push bc @@ -37766,9 +37310,7 @@ Func_20394: ; 0x20394 call Func_3357 ld a, [wNumMonHits] ld [$ff8a], a - ld a, Bank(Func_10611) - ld hl, Func_10611 - call BankSwitch + callba Func_10611 ld c, $2 jr .asm_2044b .asm_20417 @@ -37816,27 +37358,19 @@ Func_20454: ; 0x20454 ret .asm_2045f ld [$ff8a], a - ld a, Bank(Func_10496) - ld hl, Func_10496 - call BankSwitch + callba Func_10496 ld hl, $d54d inc [hl] ld [$ff8a], a - ld a, Bank(Func_106b6) - ld hl, Func_106b6 - call BankSwitch + callba Func_106b6 ld [$ff8a], a - ld a, Bank(AddCaughtPokemonToParty) - ld hl, AddCaughtPokemonToParty - call BankSwitch + callba AddCaughtPokemonToParty scf ret CapturePokemonBlueStage: ; 0x20483 ld [$ff8a], a - ld a, Bank(CapturePokemon) - ld hl, CapturePokemon - call BankSwitch + callba CapturePokemon scf ret @@ -37846,13 +37380,9 @@ Func_2048f: ; 0x2048f ret nz call Func_30e8 ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 ld [$ff8a], a - ld a, Bank(Func_10157) - ld hl, Func_10157 - call BankSwitch + callba Func_10157 ld de, $0001 call PlaySong scf @@ -37860,9 +37390,7 @@ Func_2048f: ; 0x2048f Func_204b3: ; 0x204b3 ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -37874,18 +37402,12 @@ Func_204b3: ; 0x204b3 cp MEW - 1 jr nz, .notMew ld [$ff8a], a - ld a, Bank(SetPokemonOwnedFlag) - ld hl, SetPokemonOwnedFlag - call BankSwitch + callba SetPokemonOwnedFlag .notMew ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld [$ff8a], a - ld a, Bank(Func_106a6) - ld hl, Func_106a6 - call BankSwitch + callba Func_106a6 ret Func_204f1: ; 0x204f1 @@ -37921,14 +37443,10 @@ Func_204f1: ; 0x204f1 ld [wIndicatorStates + 9], a .asm_20525 ld [$ff8a], a - ld a, Bank(Func_10184) - ld hl, Func_10184 - call BankSwitch + callba Func_10184 ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld bc, $0010 ld de, $0000 push bc @@ -38047,9 +37565,7 @@ Func_205e0: ; 0x205e0 call nz, BankSwitch ld bc, $34e8 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 call Func_30e8 call Func_30db ld de, $2bd8 @@ -38149,32 +37665,22 @@ Func_20651: ; 0x20651 call Func_7dc .asm_20700 ld [$ff8a], a - ld a, Bank(Func_16425) - ld hl, Func_16425 - call BankSwitch + callba Func_16425 ret Func_2070b: ; 0x2070b ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 ld [$ff8a], a - ld a, Bank(Func_10ca5) - ld hl, Func_10ca5 - call BankSwitch + callba Func_10ca5 ld [$ff8a], a - ld a, Bank(Func_10ac8) - ld hl, Func_10ac8 - call BankSwitch + callba Func_10ac8 ld de, $0001 call PlaySong ld hl, $d629 call Func_e4a ld [$ff8a], a - ld a, Bank(SetPokemonOwnedFlag) - ld hl, SetPokemonOwnedFlag - call BankSwitch + callba SetPokemonOwnedFlag ld a, [$d624] cp $3 ret z @@ -38195,13 +37701,9 @@ Func_20757: ; 0x20757 ret nz call Func_30e8 ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 ld [$ff8a], a - ld a, Bank(Func_10ac8) - ld hl, Func_10ac8 - call BankSwitch + callba Func_10ac8 ld de, $0001 call PlaySong scf @@ -38223,9 +37725,7 @@ Func_2077b: ; 0x2077b call Func_20a55 .asm_2078e ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -38255,18 +37755,12 @@ Func_2077b: ; 0x2077b bit 0, a jr z, .asm_207f5 ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ld [$ff8a], a - ld a, Bank(Func_16425) - ld hl, Func_16425 - call BankSwitch + callba Func_16425 .asm_207f5 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 call Func_30e8 call Func_30db ld hl, $d5cc @@ -38506,9 +38000,7 @@ Func_20977: ; 0x20977 .asm_209bf ld bc, $34dc ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 call Func_30e8 call Func_30db ld a, [wCurrentEvolutionType] @@ -38555,9 +38047,7 @@ Func_209eb: ; 0x209eb ld [$d557], a ld bc, $34dc ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 call Func_30e8 call Func_30db ld hl, $d5cc @@ -38592,9 +38082,7 @@ Func_20a65: ; 0x20a65 jr z, .asm_20a80 ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 jr asm_20a9f .asm_20a80 scf @@ -38609,9 +38097,7 @@ Func_20a82: ; 0x20a82 jr z, .asm_20a9d ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 jr asm_20a9f .asm_20a9d scf @@ -38733,19 +38219,15 @@ Func_20b02: ; 0x20b02 call Func_8e1 .asm_20b80 ld [$ff8a], a - ld a, Bank(Func_10e0a) - ld hl, Func_10e0a - call BankSwitch + callba Func_10e0a call Func_3475 ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $2d26 call PlaySoundEffect ld [$ff8a], a - ld a, Bank(Func_10825) - ld hl, Func_10825 - call BankSwitch + callba Func_10825 call Func_3475 ld a, $1 ld [$d54d], a @@ -38933,32 +38415,22 @@ Func_20c76: ; 0x20c76 call Func_7dc .asm_20d25 ld [$ff8a], a - ld a, Bank(Func_1e8f6) - ld hl, Func_1e8f6 - call BankSwitch + callba Func_1e8f6 ret Func_20d30: ; 0x20d30 ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 ld [$ff8a], a - ld a, Bank(Func_10ca5) - ld hl, Func_10ca5 - call BankSwitch + callba Func_10ca5 ld [$ff8a], a - ld a, Bank(Func_10ac8) - ld hl, Func_10ac8 - call BankSwitch + callba Func_10ac8 ld de, $0001 call PlaySong ld hl, $d629 call Func_e4a ld [$ff8a], a - ld a, Bank(SetPokemonOwnedFlag) - ld hl, SetPokemonOwnedFlag - call BankSwitch + callba SetPokemonOwnedFlag ld a, [$d624] cp $3 ret z @@ -38979,13 +38451,9 @@ Func_20d7c: ; 0x20d7c ret nz call Func_30e8 ld [$ff8a], a - ld a, Bank(Func_dc00) - ld hl, Func_dc00 - call BankSwitch + callba Func_dc00 ld [$ff8a], a - ld a, Bank(Func_10ac8) - ld hl, Func_10ac8 - call BankSwitch + callba Func_10ac8 ld de, $0001 call PlaySong scf @@ -39007,9 +38475,7 @@ Func_20da0: ; 0x20da0 call Func_21079 .asm_20db3 ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -39039,18 +38505,12 @@ Func_20da0: ; 0x20da0 bit 0, a jr z, .asm_20e1a ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ld [$ff8a], a - ld a, Bank(Func_1e8f6) - ld hl, Func_1e8f6 - call BankSwitch + callba Func_1e8f6 .asm_20e1a ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 call Func_30e8 call Func_30db ld hl, $d5cc @@ -39271,9 +38731,7 @@ Func_20f75: ; 0x20f75 .asm_20fc3 ld bc, $34dc ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 call Func_30e8 call Func_30db ld a, [wCurrentEvolutionType] @@ -39321,9 +38779,7 @@ Func_20fef: ; 0x20fef ld [$d557], a ld bc, $34dc ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 call Func_30e8 call Func_30db ld hl, $d5cc @@ -39393,9 +38849,7 @@ Func_21089: ; 0x21089 jr z, .asm_210c5 ld bc, $34d0 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 jr asm_210c7 .asm_210c5 scf @@ -39517,19 +38971,15 @@ Func_2112a: ; 0x2112a call Func_8e1 .asm_211a8 ld [$ff8a], a - ld a, Bank(Func_10e0a) - ld hl, Func_10e0a - call BankSwitch + callba Func_10e0a call Func_3475 ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld de, $2d26 call PlaySoundEffect ld [$ff8a], a - ld a, Bank(Func_10825) - ld hl, Func_10825 - call BankSwitch + callba Func_10825 call Func_3475 ld a, $1 ld [$d54d], a @@ -39570,9 +39020,7 @@ InitMeowthBonusStage: ; 0x24000 ld [$d739], a ld bc, $0100 ; 1 minute 0 seconds ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld a, $12 call SetSongBank ld de, $0004 @@ -39667,19 +39115,13 @@ StartBallMeowthBonusStage: ; 0x24059 Func_24128: ; 0x24128 ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc call Func_2862 ld [$ff8a], a - ld a, Bank(Func_24fa3) - ld hl, Func_24fa3 - call BankSwitch + callba Func_24fa3 call Func_24516 ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a ret Func_2414d: ; 0x2414d @@ -40167,9 +39609,7 @@ Func_2442a: ; 0x2442a cp $4 jr z, .asm_244c1 ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 .asm_244c1 ld a, [$d57e] and a @@ -40180,9 +39620,7 @@ Func_2442a: ; 0x2442a ld [$d7be], a call Func_2862 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, $1 ld [$d713], a ld a, $1 @@ -40205,9 +39643,7 @@ Func_244f5: ; 0x244f5 ld [wStageCollisionState], a ld [$d6e6], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_24516 ret @@ -40263,9 +39699,7 @@ Func_245ab: ; 0x245ab call PlaySoundEffect ld bc, $34c4 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore xor a ld [wMeowthStageBonusCounter], a ld a, [$d6ec] @@ -41378,9 +40812,7 @@ Func_24e7f: ; 0x24e7f push af ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore ld hl, wMeowthStageScore inc [hl] pop af @@ -41532,21 +40964,15 @@ Func_24fa3: ; 0x24fa3 Func_2583b: ; 0x2583b ld bc, $7f65 ld [$ff8a], a - ld a, Bank(Func_175a4) - ld hl, Func_175a4 - call BankSwitch + callba Func_175a4 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 call Func_259fe call Func_25895 call Func_2595e call Func_2586c ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 call Func_25a39 ret @@ -41855,9 +41281,7 @@ InitSeelBonusStage: ; 0x25a7c ld [$d739], a ld bc, $0130 ; 1 minute 30 seconds ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld a, $11 call SetSongBank ld de, $0003 @@ -41949,19 +41373,13 @@ StartBallSeelBonusStage: ; 0x25af1 Func_25b97: ; 0x25b97 ld [$ff8a], a - ld a, Bank(Func_142fc) - ld hl, Func_142fc - call BankSwitch + callba Func_142fc call Func_2862 ld [$ff8a], a - ld a, Bank(Func_262f4) - ld hl, Func_262f4 - call BankSwitch + callba Func_262f4 call Func_25d0e ld [$ff8a], a - ld a, Bank(Func_1404a) - ld hl, Func_1404a - call BankSwitch + callba Func_1404a ret Func_25bbc: ; 0x25bbc @@ -42094,9 +41512,7 @@ Func_25c5a: ; 0x25c5a cp $2 jr z, .asm_25cc1 ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 .asm_25cc1 ld a, [$d57e] and a @@ -42107,9 +41523,7 @@ Func_25c5a: ; 0x25c5a ld [$d7be], a call Func_2862 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, $3 ld [$d791], a ld a, [$d794] @@ -42130,9 +41544,7 @@ Func_25ced: ; 0x25ced ld [wStageCollisionState], a ld [$d766], a ld [$ff8a], a - ld a, Bank(LoadStageCollisionAttributes) - ld hl, LoadStageCollisionAttributes - call BankSwitch + callba LoadStageCollisionAttributes call Func_25d0e ret @@ -42285,18 +41697,14 @@ Func_25e85: ; 0x25e85 jr nc, .asm_25ead ld bc, $34d6 ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore pop de dec d jr .asm_25ebf .asm_25ead ld bc, $34ee ld [$ff8a], a - ld a, Bank(Func_8576) - ld hl, Func_8576 - call BankSwitch + callba AddBCDScore pop de ld a, d sub $32 @@ -42408,7 +41816,7 @@ Func_25f47: ; 0x25f47 pop de ret nc ld a, [de] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_25f5f: ; 0x25f5f dw Func_25f77 dw Func_25fbe @@ -42884,18 +42292,12 @@ Func_262f4: ; 0x262f4 Func_26b7e: ; 0x26b7e ld bc, $7f65 ld [$ff8a], a - ld a, Bank(Func_175a4) - ld hl, Func_175a4 - call BankSwitch + callba Func_175a4 call Func_26bf7 ld [$ff8a], a - ld a, Bank(Func_e4a1) - ld hl, Func_e4a1 - call BankSwitch + callba Func_e4a1 ld [$ff8a], a - ld a, Bank(Func_17e81) - ld hl, Func_17e81 - call BankSwitch + callba Func_17e81 call Func_26ba9 call Func_26c3c ret @@ -43017,7 +42419,7 @@ SECTION "banka", ROMX, BANK[$a] HandlePokedexScreen: ; 0x28000 ld a, [wScreenState] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable PointerTable_28004: ; 0x28004 dw LoadPokedexScreen dw MainPokedexScreen @@ -44001,7 +43403,7 @@ Func_2887c: ; 0x2887c ld a, $7a sub b ld [$ffa9], a - rst $10 + rst AdvanceFrame pop bc dec b dec b @@ -44016,7 +43418,7 @@ Func_288a2: ; 0x288a2 ld a, $44 add b ld [$ffa9], a - rst $10 + rst AdvanceFrame pop bc dec b dec b @@ -47063,13 +46465,9 @@ InitRedField: ; 0x30000 ld a, $82 ld [wIndicatorStates + 1], a ld [$ff8a], a - ld a, Bank(Func_dbba) - ld hl, Func_dbba - call BankSwitch + callba Func_dbba ld [$ff8a], a - ld a, Bank(Func_16f95) - ld hl, Func_16f95 - call BankSwitch + callba Func_16f95 ld a, $f call SetSongBank ld de, $0001 @@ -47141,9 +46539,7 @@ StartBallRedField: ; 0x3007d ld a, $3 ld [$d610], a ld [$ff8a], a - ld a, Bank(Func_16f95) - ld hl, Func_16f95 - call BankSwitch + callba Func_16f95 ld a, $f call SetSongBank ld de, $0001 @@ -47187,9 +46583,7 @@ Func_30164: ; 0x30164 .asm_30175 ld bc, $34f4 ld [$ff8a], a - ld a, Bank(Func_8588) - ld hl, Func_8588 - call BankSwitch + callba Func_8588 ld a, $2 ld [$d4ca], a ret @@ -47263,9 +46657,7 @@ StartMapMoveMode: ; 0x301ec ld [$d54d], a ld bc, $0030 ; 30 seconds ld [$ff8a], a - ld a, Bank(StartTimer) - ld hl, StartTimer - call BankSwitch + callba StartTimer ld a, [wCurrentStage] bit 0, a jr z, .asm_3021b @@ -47274,7 +46666,7 @@ StartMapMoveMode: ; 0x301ec call Func_30256 .asm_3021b ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_3021f: ; 0x3021f ; STAGE_RED_FIELD_TOP dw Func_311b4 @@ -47300,11 +46692,9 @@ Func_3022b: ; 0x3022b ld [wInSpecialMode], a ld [wSpecialMode], a ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 ld a, [wCurrentStage] - rst $18 ; calls JumpToFuncInTable + rst JumpTable ; calls JumpToFuncInTable CallTable_30247: ; 0x30247 ; STAGE_RED_FIELD_TOP dw Func_31234 @@ -47567,14 +46957,10 @@ Func_311b4: ; 0x311b4 .asm_311e2 ld a, $2 ld [$ff8a], a - ld a, Bank(Func_149d9) - ld hl, Func_149d9 - call BankSwitch + callba Func_149d9 ld a, $5 ld [$ff8a], a - ld a, Bank(Func_149d9) - ld hl, Func_149d9 - call BankSwitch + callba Func_149d9 ld a, $6a ld [$c7f0], a ld a, $6b @@ -47584,9 +46970,7 @@ Func_311b4: ; 0x311b4 ld a, $67 ld [$c803], a ld [$ff8a], a - ld a, Bank(Func_107b0) - ld hl, Func_107b0 - call BankSwitch + callba Func_107b0 ld a, $4 ld [$d7ad], a ld de, $0003 @@ -47595,43 +46979,27 @@ Func_311b4: ; 0x311b4 bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ret Func_31234: ; 0x31234 ld [$ff8a], a - ld a, Bank(Func_107a5) - ld hl, Func_107a5 - call BankSwitch + callba Func_107a5 ld [$ff8a], a - ld a, Bank(Func_107c2) - ld hl, Func_107c2 - call BankSwitch + callba Func_107c2 ld [$ff8a], a - ld a, Bank(Func_107c8) - ld hl, Func_107c8 - call BankSwitch + callba Func_107c8 ld [$ff8a], a - ld a, Bank(Func_107e9) - ld hl, Func_107e9 - call BankSwitch + callba Func_107e9 ld a, [wCurrentStage] bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ld [$ff8a], a - ld a, Bank(Func_16425) - ld hl, Func_16425 - call BankSwitch + callba Func_16425 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ret Func_31281: ; 0x31282 @@ -47741,9 +47109,7 @@ Func_31326: ; 0x31326 ld [wIndicatorStates + 4], a ld a, $3 ld [$ff8a], a - ld a, Bank(Func_1de4b) - ld hl, Func_1de4b - call BankSwitch + callba Func_1de4b jr .asm_31382 .asm_3134c ld a, $80 @@ -47755,19 +47121,13 @@ Func_31326: ; 0x31326 ld [wIndicatorStates + 4], a ld a, $1 ld [$ff8a], a - ld a, Bank(Func_1de4b) - ld hl, Func_1de4b - call BankSwitch + callba Func_1de4b ld a, $6 ld [$ff8a], a - ld a, Bank(Func_1de4b) - ld hl, Func_1de4b - call BankSwitch + callba Func_1de4b ld a, $7 ; TODO: this might be the bank of Func_1de6f ld [$ff8a], a - ld a, Bank(Func_1de6f) - ld hl, Func_1de6f - call BankSwitch + callba Func_1de6f .asm_31382 ld a, [wCurrentStage] bit 0, a @@ -47784,50 +47144,34 @@ Func_31326: ; 0x31326 ld a, $1 ld [$d644], a ld [$ff8a], a - ld a, Bank(Func_1f2ed) - ld hl, Func_1f2ed - call BankSwitch + callba Func_1f2ed ld de, $0003 call PlaySong ld a, [wCurrentStage] bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ret Func_313c3: ; 0x313c3 ld [$ff8a], a - ld a, Bank(Func_107a5) - ld hl, Func_107a5 - call BankSwitch + callba Func_107a5 ld [$ff8a], a - ld a, Bank(Func_107c2) - ld hl, Func_107c2 - call BankSwitch + callba Func_107c2 ld [$ff8a], a - ld a, Bank(Func_1f2ff) - ld hl, Func_1f2ff - call BankSwitch + callba Func_1f2ff ld a, $0 ld [$d644], a ld a, [wCurrentStage] bit 0, a ret z ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ld [$ff8a], a - ld a, Bank(Func_1e8f6) - ld hl, Func_1e8f6 - call BankSwitch + callba Func_1e8f6 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ret Func_3140b: ; 0x3140b @@ -47965,9 +47309,7 @@ Func_314f1: ; 0x314f1 Func_314f3: ; 0x314f3 ld [$ff8a], a - ld a, Bank(Func_3022b) - ld hl, Func_3022b - call BankSwitch + callba Func_3022b ld de, $0001 call PlaySong scf @@ -47979,9 +47321,7 @@ Func_31505: ; 0x31505 ret nz call Func_30e8 ld [$ff8a], a - ld a, Bank(Func_3022b) - ld hl, Func_3022b - call BankSwitch + callba Func_3022b ld de, $0001 call PlaySong scf @@ -47992,9 +47332,7 @@ Func_3151f: ; 0x3151f ld [$d4ef], a ld [$d4f1], a ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -48013,22 +47351,14 @@ Func_3151f: ; 0x3151f bit 0, a jr z, .asm_31577 ld [$ff8a], a - ld a, Bank(Func_14135) - ld hl, Func_14135 - call BankSwitch + callba Func_14135 ld [$ff8a], a - ld a, Bank(Func_16425) - ld hl, Func_16425 - call BankSwitch + callba Func_16425 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 .asm_31577 ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 call Func_30e8 call Func_30db ld hl, $d5cc @@ -48077,28 +47407,20 @@ Func_315b3: ; 0x315b3 Func_315d5: ; 0x315d5 ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld [$ff8a], a - ld a, Bank(Func_31281) - ld hl, Func_31281 - call BankSwitch + callba Func_31281 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ld de, $2525 call PlaySoundEffect ld bc, $2cbf ld [$ff8a], a - ld a, Bank(Func_3118f) - ld hl, Func_3118f - call BankSwitch + callba Func_3118f .asm_31603 ld [$ff8a], a - ld a, Bank(Func_33e3) - ld hl, Func_33e3 - call BankSwitch - rst $10 + callba Func_33e3 + rst AdvanceFrame ld a, [$d5ca] and a jr nz, .asm_31603 @@ -48154,9 +47476,7 @@ Func_3165e: ; 0x3165e Func_31660: ; 0x31660 ld [$ff8a], a - ld a, Bank(Func_3022b) - ld hl, Func_3022b - call BankSwitch + callba Func_3022b ld de, $0001 call PlaySong scf @@ -48168,9 +47488,7 @@ Func_31672: ; 0x31672 ret nz call Func_30e8 ld [$ff8a], a - ld a, Bank(Func_3022b) - ld hl, Func_3022b - call BankSwitch + callba Func_3022b ld de, $0001 call PlaySong scf @@ -48185,9 +47503,7 @@ Func_3168c: ; 0x3168c ld a, $1 ld [$d646], a ld [$ff8a], a - ld a, Bank(Func_107f8) - ld hl, Func_107f8 - call BankSwitch + callba Func_107f8 ld a, [$d57e] and a ret z @@ -48206,22 +47522,14 @@ Func_3168c: ; 0x3168c bit 0, a jr z, .asm_316ee ld [$ff8a], a - ld a, Bank(Func_1c2cb) - ld hl, Func_1c2cb - call BankSwitch + callba Func_1c2cb ld [$ff8a], a - ld a, Bank(Func_1e8f6) - ld hl, Func_1e8f6 - call BankSwitch + callba Func_1e8f6 ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 .asm_316ee ld [$ff8a], a - ld a, Bank(Func_86d2) - ld hl, Func_86d2 - call BankSwitch + callba Func_86d2 call Func_30e8 call Func_30db ld hl, $d5cc @@ -48270,28 +47578,20 @@ Func_3172a: ; 0x3172a Func_3174c: ; 0x3174c ld de, $0000 call PlaySong - rst $10 + rst AdvanceFrame ld [$ff8a], a - ld a, Bank(Func_3140b) - ld hl, Func_3140b - call BankSwitch + callba Func_3140b ld [$ff8a], a - ld a, Bank(Func_30253) - ld hl, Func_30253 - call BankSwitch + callba Func_30253 ld de, $2525 call PlaySoundEffect ld bc, $2cbf ld [$ff8a], a - ld a, Bank(Func_3118f) - ld hl, Func_3118f - call BankSwitch + callba Func_3118f .asm_3177a ld [$ff8a], a - ld a, Bank(Func_33e3) - ld hl, Func_33e3 - call BankSwitch - rst $10 + callba Func_33e3 + rst AdvanceFrame ld a, [$d5ca] and a jr nz, .asm_3177a @@ -54492,7 +53792,13 @@ RhydonBillboardBGPaletteMap: ; 0xd8968 SaverTextOffGfx: ; 0xd8c00 INCBIN "gfx/stage/saver_off.2bpp" - dr $d8c40, $d9000 + dr $d8c40, $d8e80 + +Data_d8e80: + dr $d8e80, $d8f60 + +Data_d8f60: + dr $d8f60, $d9000 StageRedFieldBottomCollisionMasks: ; 0xd9000 INCBIN "data/collision/masks/red_stage_bottom.masks" @@ -55739,7 +55045,10 @@ MewAnimatedObjPalette2: ; 0xdbe68 RGB 23, 8, 17 RGB 0, 0, 0 - dr $dbe70, $dc000 + dr $dbe70, $dbe80 + +Data_dbe80: + dr $dbe80, $dc000 SECTION "bank37", ROMX, BANK[$37] @@ -58036,6 +57345,7 @@ MasterBallObjPalette: ; 0xdd180 RGB 21, 3, 21 RGB 0, 0, 0 +Data_dd188: dr $dd188, $e0000 @@ -2,196 +2,196 @@ SECTION "WRAM Bank 0", WRAM0 wc000:: - ds $400 + ds $400 wMonAnimatedCollisionMask:: ; 0xc400 - ds $80 + ds $80 - ds $80 + ds $80 wcBottomMessageText:: ; 0xc500 - ds $200 + ds $200 wStageCollisionMap:: ; 0xc700 ; Collision data for each tile for the current stage. - ds $300 + ds $300 - ds $600 + ds $600 SECTION "WRAM Bank 1", WRAMX, BANK[1] wOAMBuffer:: ; d000 - ; buffer for OAM data. Copied to OAM by DMA - ds 4 * 40 + ; buffer for OAM data. Copied to OAM by DMA + ds 4 * 40 - ds $160 + ds $160 wPaletteData:: ; 0xd200 - ; 16 palette definitions - ds $100 + ; 16 palette definitions + ds $100 wPartyMons:: ; 0xd300 ; List of pokemon in the player's party. ; When a pokemon is caught, it's appended to this list. ; When a pokemon is evolved, the pokemon's evolution replaces its entry in the list. - ds $160 + ds $160 wNumPartyMons:: ; ; 0xd460 ; Number of pokemon in the wPartyMons list. - ds 1 + ds 1 - ds 9 + ds 9 wScore:: ; 0xd46a ; player's current score - ds 6 + ds 6 - ds $e + ds $e wBallType:: ; 0xd47e ; PokeBall, Great Ball, Ultra Ball, or Master Ball - ds 1 + ds 1 wBallTypeCounter:: ; 0xd47f ; two-byte counter that represents how many frames remain until the Ball uprade goes down to the next level. - ds 2 + ds 2 wBallTypeBackup:: ; 0xd481 ; Holds the ball type during bonus stages, since they always use a regular pokeball. - ds 1 + ds 1 - ds $1f + ds $1f wBallSaverIconOn:: ; 0xd4a1 ; The blue Ball Saver icon is illuminated when this byte is non-zero. - ds 1 + ds 1 - ds 1 + ds 1 wBallSaverTimerFrames:: ; 0xd4a3 ; Count the number of frames until wBallSaverTimerSeconds should be decremented - ds 1 + ds 1 wBallSaverTimerSeconds:: ; 0xd4a4 ; Remaining seconds for Ball Saver - ds 1 + ds 1 - ds 1 + ds 1 wBallSaverTimerFramesBackup:: ; 0xd4a6 ; Used to store a backup of wBallSaverTimerFrames - ds 1 + ds 1 wBallSaverTimerSecondsBackup:: ; 0xd4a7 ; Used to store a backup of wBallSaverTimerSeconds - ds 1 + ds 1 - ds 4 + ds 4 wCurrentStage:: ; 0xd4ac - ds 1 + ds 1 - ds 2 + ds 2 wStageCollisionState:: ; 0xd4af ; Stores the current collision state id for the stage ; For example, the Red stage can have different collision states when ; the Ditto lane is open, or when there is a wall above the Voltorbs. - ds 1 + ds 1 - ds 3 + ds 3 wBallXPos:: ; 0xd4b3 ; x coordinate of the center of the pokeball ; little-endian word ; Most-significant byte is the pixel, and least-significant byte is fraction of a pixel - ds 2 + ds 2 wBallYPos:: ; 0xd4b5 ; y coordinate of the center of the pokeball ; little-endian word ; Most-significant byte is the pixel, and least-significant byte is fraction of a pixel - ds 2 + ds 2 wPreviousBallXPos:: ; 0xd4b7 ; x coordinate of the center of the pokeball in the previous frame ; little-endian word ; Most-significant byte is the pixel, and least-significant byte is fraction of a pixel - ds 2 + ds 2 wPreviousBallYPos:: ; 0xd4b9 ; y coordinate of the center of the pokeball in the previous frame ; little-endian word ; Most-significant byte is the pixel, and least-significant byte is fraction of a pixel - ds 2 + ds 2 wBallXVelocity:: ; 0xd4bb ; little-endian word ; This is added to wBallXPos every frame. - ds 2 + ds 2 wBallYVelocity:: ; 0xd4bd ; little-endian word ; This is added to wBallYPos every frame. - ds 2 + ds 2 - ds 4 + ds 4 wBallSpin:: ; 0xd4c3 - ds 1 + ds 1 wBallRotation:: ; 0xd4c4 ; wBallSpin is added to this every frame - ds 1 + ds 1 - ds $1c + ds $1c wInitialMapSelectionIndex:: ; 0xd4e1 ; index to keep track of the spinning map selection at the start of a new game - ds 1 + ds 1 - ds $d + ds $d - ds 1 + ds 1 wLeftMapMoveCounter:: ; 0xd4f0 ; Diglett or Poliwag counter that counts to three to trigger a Map Move - ds 1 + ds 1 - ds 1 + ds 1 wRightMapMoveCounter:: ; 0xd4f2 ; Diglett or Psyduck counter that counts to three to trigger a Map Move\ - ds 1 + ds 1 wLeftMapMoveDiglettAnimationCounter:: ; 0xd4f3 ; Counter that loops to control the left-side map move diglett head bobbing animation - ds 1 + ds 1 wLeftMapMoveDiglettFrame:: ; 0xd4f4 ; Contains frame for map move diglett head bobbing animation - ds 1 + ds 1 wRightMapMoveDiglettAnimationCounter :: ; 0xd4f5 ; Counter that loops to control the left-side map move diglett head bobbing animation - ds 1 + ds 1 wRightMapMoveDiglettFrame:: ; 0xd4f6 ; Contains frame for map move diglett head bobbing animation - ds 1 + ds 1 - ds 6 + ds 6 wBellsproutAnimationFrameCounter:: ; 0xd4fd - ds 1 + ds 1 wBellsproutAnimationFrame:: ; 0xd4fe - ds 1 + ds 1 wBellsproutAnimationFrameIndex:: ; 0xd4ff - ds 1 + ds 1 - ds $19 + ds $19 wPikachuSaverAnimationFrameCounter:: ; 0xd519 - ds 1 + ds 1 wPikachuSaverAnimationFrame:: ; 0xd51a - ds 1 + ds 1 wPikachuSaverAnimationFrameIndex:: ; 0xd51b - ds 1 + ds 1 - ds $13 + ds $13 wIndicatorStates:: ; 0xd52f ; Each byte represents the status of each possible indicator on the stage. @@ -199,104 +199,109 @@ wIndicatorStates:: ; 0xd52f ; a certain area. For example, when the Cloyster can be entered in the Blue ; Stage, the blue right arrow will starting blinking in the bottom half of that ; stage. - ds $13 + ds $13 wLeftAlleyTrigger:: ; 0xd542 ; Set to $1 when ball passes over the bottom-left corner of the Blue/Red field top screen ; It's used to determine if the Ball was hit up the left side alley. - ds 1 + ds 1 wLeftAlleyCount:: ; 0xd543 ; Increments when the Ball travels up the left alley. ; When the count is 3, evolution mode can be triggered. - ds 1 + ds 1 wRightAlleyTrigger:: ; 0xd544 ; Set to $1 when Ball passes over the bottom-right corner of the Blue/Red field top screen ; It's used to determine if the Ball was hit up the right side alley. - ds 1 + ds 1 wRightAlleyCount:: ; 0xd545 ; Increments when the Ball travels up the right alley. ; When the count is 2, Catch 'Em Mode can be triggered. ; If the count is 3, the current map's rare pokemon will be used for Catch 'Em Mode. - ds 1 + ds 1 wSecondaryLeftAlleyTrigger:: ; 0xd546 ; Set to $1 when Ball passes over the bottom of the skinny alley between the left alley and Staryu button on the Red Field top screen. ; It's used to determine if the Ball was hit up the Red Stage's secondary left-side alley. - ds 1 + ds 1 - ds 3 + ds 3 wCurrentMap:: ; 0xd54a ; Current map during play. See map_constants.asm - ds 1 + ds 1 wInSpecialMode:: ; 0xd54b ; Set to non-zero when things like Catch 'em Mode or Map Move mode start. - ds 1 + ds 1 - ds 4 + ds 4 wSpecialMode:: ; 0xd550 ; wInSpecialMode must be non-zero to activate this. ; 0 = Catch Em Mode ; 1 = Evolution Mode ; 2 = Map Move Mode - ds 1 + ds 1 - ds 1 + ds 1 wCurrentEvolutionMon:: ; 0xd552 ; Current mon id for Evolution Mode. ; It stores (mon id - 1). - ds 1 + ds 1 wCurrentEvolutionType:: ; 0xd553 ; Evolution type for the current mon in Evolution Mode. ; See evolution_type_constants.asm - ds 1 + ds 1 - ds 7 + ds 7 wRareMonsFlag:: ; 0xd55b ; Gets set to $8 when the rare mons should be used for catch 'em mode. $8 is then doubled to add $10 to the base address of the map's wild mons table. - ds 1 + ds 1 - ds $1d + ds $1d wCurrentCatchEmMon:: ; 0xd579 ; Current mon id for CatchEm Mode. ; It stores (mon id - 1). - ds 1 + ds 1 wTimerSeconds:: ; 0xd57a - ds 1 + ds 1 wTimerMinutes:: ; 0xd57b - ds 1 + ds 1 wTimerFrames:: ; 0xd57c - ds 1 + ds 1 - ds $43 + ds $43 wNumMonHits:: ; 0xd5c0 ; Number of times the wild pokemon has been hit in Catch'em mode - ds 1 + ds 1 - ds $33 + ds $33 wBallCaptureAnimationFrameCounter:: ; 0xd5f4 - ds 1 + ds 1 wBallCaptureAnimationFrame:: ; 0xd5f5 ; OAM id - ds 1 + ds 1 wBallCaptureAnimationFrameIndex:: ; 0xd5f6 - ds 1 + ds 1 - ds $38 + ds $1f + +wGameOver:: + ds 1 + + ds $18 ; d617 ; Number of times the Mewtwo Bonus stage has been defeated. ; Counts up at most to 2, and is reset if Mew is encountered. wNumMewtwoBonusCompletions:: ; 0xd62f - ds 1 + ds 1 - ds $e + ds $e wBlueStageForceFieldDirection:: ; 0xd63e ; Controls the direction of the arrow force field in between Cloyster and Slowpoke in the Blue Stage. @@ -304,54 +309,54 @@ wBlueStageForceFieldDirection:: ; 0xd63e ; $1 = right ; $2 = down ; $3 = left - ds 1 + ds 1 - ds $aa + ds $aa wMeowthAnimationFrameCounter:: ; 0xd6e9 ; Counts down. When it hits 0, the next animation frame happens. - ds 1 + ds 1 wMeowthAnimationFrame:: ; 0xd6ea ; OAM id - ds 1 + ds 1 wMeowthAnimationFrameIndex:: ; 0xd6eb - ds 1 + ds 1 - ds 1 + ds 1 wMeowthXPosition:: ; 0xd6ed - ds 1 + ds 1 wMeowthYPosition:: ; 0xd6ee - ds 1 + ds 1 - ds 1 + ds 1 wMeowthXMovement:: ; 0xd6f0 ; Used to move meowth horizontally. ; Value is $01 when moving right. ; Value is $ff when moving left. - ds 1 + ds 1 wMeowthYMovement:: ; 0xd6f1 ; Used to move meowth vertically. ; Value is $01 when moving down. ; Value is $ff when moving up. - ds 1 + ds 1 - ds $1d + ds $1d wMeowthStageBonusCounter:: ; 0xd70f ; Keeps track of how many bonus points you get from collecting a coin. ; The bonus increases by 1 each time you collect a coin. ; If Meowth is hit, the bonus resets to 0. - ds 1 + ds 1 - ds 1 + ds 1 wMeowthStageScore:: ; 0xd711 ; Number of Meowth coins collected. - ds 1 + ds 1 - ds $2b + ds $2b wDiglettStates:: ; 0xd73d ; Each diglett has a sprite state 1 - 5. @@ -363,29 +368,29 @@ wDiglettStates:: ; 0xd73d ; $4 = straight up ; $5 = leaning right ; $6 = getting hit - ds 31 + ds 31 wCurrentDiglett:: ; 0xd75c ; Keeps track of which diglett is being updated. - ds 1 + ds 1 wDiglettsInitializedFlag:: ; 0xd75d ; bit 0 is set after all digletts have been initialized - ds 1 + ds 1 wDiglettInitDelayCounter:: ; 0xd75e ; used to faciliate how fast the digletts are initialized - ds 1 + ds 1 - ds 2 + ds 2 wDugtrioAnimationFrameCounter:: ; 0xd761 - ds 1 + ds 1 wDugtrioAnimationFrame:: ; 0xd762 ; OAM id - ds 1 + ds 1 wDugtrioAnimationFrameIndex:: ; 0xd763 - ds 1 + ds 1 wDugrioState:: ; 0xd764 ; Similar function as wDiglettStates. @@ -397,280 +402,280 @@ wDugrioState:: ; 0xd764 ; $5 = 1 healthy dugtrio ; $6 = Getting hit third time ; $7 = Disappearing - ds 1 + ds 1 - ds $3c + ds $3c wLeftTiltCounter:: ; 0xd7a1 ; Counts up to 3 and back down to time the left tilt animation - ds 1 + ds 1 wLeftTiltReset:: ; 0xd7a2 ; Set to $1 when the left tilt button has been held down long enough - ds 1 + ds 1 wRightTiltCounter:: ; 0xd7a3 ; Counts up to 3 and back down to time the right tilt animation - ds 1 + ds 1 wRightTiltReset:: ; 0xd7a4 ; Set to $1 when the right tilt button has been held down long enough - ds 1 + ds 1 wUpperTiltCounter:: ; 0xd7a5 ; Counts up to 3 and back down to time the upper tilt animation - ds 1 + ds 1 wUpperTiltReset:: ; 0xd7a6 ; Set to $1 when the upper tilt button has been held down long enough - ds 1 + ds 1 wLeftTiltPushing:: ; 0xd7a7 ; Set to $1 when the left tilt is in the first half of its animation - ds 1 + ds 1 wRightTiltPushing:: ; 0xd7a8 ; Set to $1 when the right tilt is in the first half of its animation - ds 1 + ds 1 wUpperTiltPushing:: ; 0xd7a9 ; Set to $1 when the upper tilt is in the first half of its animation - ds 1 + ds 1 - ds 12 + ds 12 wLeftFlipperAnimationState:: ; 0xd7b6 ; Counts from $0 to $f when using the left flipper. - ds 1 + ds 1 wRightFlipperAnimationState:: ; 0xd7b7 ; Counts from $0 to $f when using the right flipper. - ds 1 + ds 1 wFlipperXCollisionAttribute:: ; 0xd7b8 ; Goes with hFlipperYCollisionAttribute - ds 1 + ds 1 wFlipperCollision:: ; 0xd7b9 ; Set to $1 when the ball is colliding with a flipper - ds 1 + ds 1 - ds 9 + ds 9 wSubTileBallXPos:: ; 0xd7c3 - ds 1 + ds 1 wSubTileBallYPos:: ; 0xd7c4 - ds 1 + ds 1 wUpperLeftCollisionAttribute:: ; 0xd7c5 - ds 1 + ds 1 wLowerLeftCollisionAttribute:: ; 0xd7c6 - ds 1 + ds 1 wUpperRightCollisionAttribute:: ; 0xd7c7 - ds 1 + ds 1 wLowerRightCollisionAttribute:: ; 0xd7c8 - ds 1 + ds 1 - ds $23 + ds $23 wStageCollisionMapPointer:: ; 0xd7ec ; pointer to the current collision map (always points to wStageCollisionMapPointer, except when loading new attributes) - ds 2 + ds 2 wStageCollisionMapBank:: ; 0xd7ee ; holds bank of current collision map (always $00, except when loading new attributes) - ds 1 + ds 1 wStageCollisionMasksPointer:: ; 0xd7ef ; Pointer to the current collision masks array - ds 2 + ds 2 wStageCollisionMasksBank:: ; 0xd7f1 ; Holds bank of current collision masks array - ds 1 + ds 1 - ds 7 + ds 7 wInGameMenuIndex:: ; 0xd7f9 - ds 1 + ds 1 - ds $61 + ds $61 wCurrentSongBank:: ; 0xd85b - ds 1 + ds 1 - ds $95 + ds $95 wCurrentScreen:: ; 0xd8f1 ; The game is driven by state machines. This is the current screen. - ds 1 + ds 1 wScreenState:: ; 0xd8f2 ; The game is driven by state machines. This is the current state for the current screen. - ds 1 + ds 1 - ds 22 + ds 22 wTitleScreenCursorSelection:: ; 0xd909 ; 0 = Game Start ; 1 = PokeDex ; 2 = Option - ds 1 + ds 1 wTitleScreenGameStartCursorSelection:: ; 0xd90a ; 0 = New Game ; 1 = Continue - ds 1 + ds 1 - ds 1 + ds 1 wTitleScreenBlinkAnimationFrame:: ; 0xd90c ; Pikachu's blinking animation is looped through frames. This keeps track of the current frame. - ds 1 + ds 1 wTitleScreenBlinkAnimationCounter:: ; 0xd90d ; Counts down. When it hits 0, wTitleScreenBlinkAnimationFrame is incremented. - ds 1 + ds 1 wTitleScreenBouncingBallAnimationFrame:: ; 0xd90e ; The bouncing Pokeball on the title screen has a 6-frame animation. This keeps track of the current frame. - ds 1 + ds 1 wTitleScreenPokeballAnimationCounter:: ; 0xd90f - ds 1 + ds 1 - ds 2 + ds 2 wFieldSelectBlinkingBorderTimer:: ; 0xd912 ; Number of frames to blink the field select screen border after the player chooses a field. - ds 1 + ds 1 wSelectedFieldIndex:: ; d913 ; $0 if player is hovering cursor over Red Stage ; $1 if player is hovering cursor over Blue Stage - ds 1 + ds 1 wFieldSelectBlinkingBorderFrame:: ; 0xd914 ; The blinking border's current animation frame. - ds 1 + ds 1 - ds 5 + ds 5 wSoundTestCurrentBackgroundMusic:: ; d91a - ds 1 + ds 1 wSoundTextCurrentSoundEffect:: ; 0xd91b - ds 1 + ds 1 - ds 44 + ds 44 wKeyConfigs:: ; 0xd948 ; each function map to two joypad buttons (see joy_constants.asm) wKeyConfigBallStart:: ; 0xd948 - ds 2 + ds 2 wKeyConfigLeftFlipper:: ; 0xd94a - ds 2 + ds 2 wKeyConfigRightFlipper:: ; 0xd94c - ds 2 + ds 2 wKeyConfigLeftTilt:: ; 0xd94e - ds 2 + ds 2 wKeyConfigRightTilt:: ; 0xd950 - ds 2 + ds 2 wKeyConfigUpperTilt:: ; 0xd952 - ds 2 + ds 2 wKeyConfigMenu:: ; 0xd954 - ds 2 + ds 2 - ds 3 + ds 3 wCurPokedexIndex:: ; 0xd959 ; Stores the mon index of which pokemon the cursor is on in the Pokedex screen. - ds 1 + ds 1 wPokedexOffset:: ; 0xd95a ; Stores the number of pokedex entries that are above the current displayed pokemon entries. - ds 1 + ds 1 - ds 7 + ds 7 wPokedexFlags:: ; 0xd962 ; Each pokemon is represented by one byte in the normal Pokedex order ; byte == 0: mon hasn't been seen ; byte == 1: mon has been seen ; byte >= 2: mon has been captured - ds 151 + ds 151 wNumPokemonSeen:: ; 0xd9f9 - ds 2 + ds 2 wNumPokemonOwned:: ; 0xd9fb - ds 2 + ds 2 wRedHighScores:: ; 0xd9fd wRedHighScore1Points:: ; 0xd9fd - ds 6 + ds 6 wRedHighScore1Name:: ; 0xda03 - ds 3 - ds 4 + ds 3 + ds 4 wRedHighScore2Points:: ; 0xda0a - ds 6 + ds 6 wRedHighScore2Name:: ; 0xda10 - ds 3 - ds 4 + ds 3 + ds 4 wRedHighScore3Points:: ; 0xda17 - ds 6 + ds 6 wRedHighScore3Name:: ; 0xda1d - ds 3 - ds 4 + ds 3 + ds 4 wRedHighScore4Points:: ; 0xda24 - ds 6 + ds 6 wRedHighScore4Name:: ; 0xda2a - ds 3 - ds 4 + ds 3 + ds 4 wRedHighScore5Points:: ; 0xda31 - ds 6 + ds 6 wRedHighScore5Name:: ; 0xda37 - ds 3 - ds 4 + ds 3 + ds 4 wBlueHighScores:: ; 0xda3e wBlueHighScore1Points:: ; 0xda3e - ds 6 + ds 6 wBlueHighScore1Name:: ; 0xda44 - ds 3 - ds 4 + ds 3 + ds 4 wBlueHighScore2Points:: ; 0xda4b - ds 6 + ds 6 wBlueHighScore2Name:: ; 0xda52 - ds 3 - ds 4 + ds 3 + ds 4 wBlueHighScore3Points:: ; 0xda58 - ds 6 + ds 6 wBlueHighScore3Name:: ; 0xda5e - ds 3 - ds 4 + ds 3 + ds 4 wBlueHighScore4Points:: ; 0xda65 - ds 6 + ds 6 wBlueHighScore4Name:: ; 0xda6b - ds 3 - ds 4 + ds 3 + ds 4 wBlueHighScore5Points:: ; 0xda72 - ds 6 + ds 6 wBlueHighScore5Name:: ; 0xda78 - ds 3 - ds 4 + ds 3 + ds 4 - ds 4 + ds 4 wHighScoresStage:: ; 0xda83 ; Current stage's high scores. ; 0 = Red Stage ; 1 = Blue stage - ds 1 + ds 1 wHighScoresArrowAnimationCounter:: ; 0xda84 ; Counts up to $28 and wraps around to $0 to control the animation of the ; arrows in the bottom corner of the high scores screen. - ds 1 + ds 1 - ds 2 + ds 2 wSendHighScoresAnimationFrameCounter:: ; 0xda87 - ds 1 + ds 1 wSendHighScoresAnimationFrame:: ; 0xda88 - ds 1 + ds 1 wSendHighScoresAnimationFrameIndex:: ; 0xda89 - ds 1 + ds 1 |