Merge branch 'master' of https://github.com/pret/pokered

engine/battle/animations.asm

@@ -2607,21 +2607,21 @@ CopyTileIDs:
 
 TileIDListPointerTable:
 	dw Unknown_79b24
-	db $77
+	dn 7, 7
 	dw Unknown_79b55
-	db $57
+	dn 5, 7
 	dw Unknown_79b78
-	db $37
-	dw Unknown_79b8d
-	db $77
-	dw Unknown_79bbe
-	db $77
-	dw Unknown_79bef
-	db $77
+	dn 3, 7
+	dw GengarIntroTiles1
+	dn 7, 7
+	dw GengarIntroTiles2
+	dn 7, 7
+	dw GengarIntroTiles3
+	dn 7, 7
 	dw Unknown_79c20
-	db $86
+	dn 8, 6
 	dw Unknown_79c50
-	db $3C
+	dn 3, 12
 
 DownscaledMonTiles_5x5:
 	db $31,$38,$46,$54,$5B
@@ -2656,7 +2656,7 @@ Unknown_79b78:
 	db $02,$09,$10,$17,$1E,$25,$2C
 	db $04,$0B,$12,$19,$20,$27,$2E
 
-Unknown_79b8d:
+GengarIntroTiles1:
 	db $00,$00,$00,$00,$00,$00,$00
 	db $00,$00,$00,$00,$00,$19,$00
 	db $02,$06,$0B,$10,$14,$1A,$00
@@ -2665,7 +2665,7 @@ Unknown_79b8d:
 	db $04,$09,$0E,$13,$17,$1D,$1F
 	db $05,$0A,$0F,$01,$18,$1E,$20
 
-Unknown_79bbe:
+GengarIntroTiles2:
 	db $00,$00,$00,$30,$00,$37,$00
 	db $00,$00,$2B,$31,$34,$38,$3D
 	db $21,$26,$2C,$01,$35,$39,$3E
@@ -2674,7 +2674,7 @@ Unknown_79bbe:
 	db $24,$29,$2F,$01,$01,$3B,$00
 	db $25,$2A,$01,$01,$01,$3C,$00
 
-Unknown_79bef:
+GengarIntroTiles3:
 	db $00,$00,$00,$00,$00,$00,$00
 	db $00,$00,$47,$4D,$00,$00,$00
 	db $00,$00,$48,$4E,$52,$56,$5B

engine/battle/battle_transitions.asm

@@ -118,8 +118,8 @@ GetBattleTransitionID_CompareLevels:
 	ld [wBattleTransitionSpiralDirection], a
 	ret
 
-; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps,
-; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE
+; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps,
+; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE
 ; and SILPH_CO_[9-11]F as dungeon maps
 GetBattleTransitionID_IsDungeonMap:
 	ld a, [wCurMap]
@@ -155,30 +155,30 @@ GetBattleTransitionID_IsDungeonMap:
 ; is equal to one of these maps
 DungeonMaps1:
 	db VIRIDIAN_FOREST
-	db ROCK_TUNNEL_1
-	db SEAFOAM_ISLANDS_1
-	db ROCK_TUNNEL_2
+	db ROCK_TUNNEL_1F
+	db SEAFOAM_ISLANDS_1F
+	db ROCK_TUNNEL_B1F
 	db $FF
 
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
 ; is in between or equal to each pair of maps
 DungeonMaps2:
 	; all MT_MOON maps
-	db MT_MOON_1
-	db MT_MOON_3
+	db MT_MOON_1F
+	db MT_MOON_B2F
 
-	; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME
-	db SS_ANNE_1
+	; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
+	db SS_ANNE_1F
 	db HALL_OF_FAME
 
-	; all POKEMONTOWER maps and Lavender Town buildings
+	; all POKEMON_TOWER maps and Lavender Town buildings
 	db LAVENDER_POKECENTER
-	db LAVENDER_HOUSE_2
+	db LAVENDER_CUBONE_HOUSE
 
-	; SILPH_CO_[2-8]F, MANSION[2-4], SAFARI_ZONE, and UNKNOWN_DUNGEON maps,
-	; except for SILPH_CO_1F
+	; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
+	; CERULEAN_CAVE maps, except for SILPH_CO_1F
 	db SILPH_CO_2F
-	db UNKNOWN_DUNGEON_1
+	db CERULEAN_CAVE_1F
 	db $FF
 
 LoadBattleTransitionTile:

engine/battle/common_text.asm

@@ -3,9 +3,9 @@ PrintBeginningBattleText:
 	dec a
 	jr nz, .trainerBattle
 	ld a, [wCurMap]
-	cp POKEMONTOWER_3
+	cp POKEMON_TOWER_3F
 	jr c, .notPokemonTower
-	cp LAVENDER_HOUSE_1
+	cp MR_FUJIS_HOUSE
 	jr c, .pokemonTower
 .notPokemonTower
 	ld a, [wEnemyMonSpecies2]

engine/battle/core.asm

@@ -3371,9 +3371,9 @@ IsGhostBattle:
 	dec a
 	ret nz
 	ld a, [wCurMap]
-	cp POKEMONTOWER_1
+	cp POKEMON_TOWER_1F
 	jr c, .next
-	cp LAVENDER_HOUSE_1
+	cp MR_FUJIS_HOUSE
 	jr nc, .next
 	ld b, SILPH_SCOPE
 	call IsItemInBag

engine/battle/init_battle_variables.asm

@@ -30,7 +30,7 @@ InitBattleVariables:
 	ld a, [wCurMap]
 	cp SAFARI_ZONE_EAST
 	jr c, .notSafariBattle
-	cp SAFARI_ZONE_REST_HOUSE_1
+	cp SAFARI_ZONE_CENTER_REST_HOUSE
 	jr nc, .notSafariBattle
 	ld a, BATTLE_TYPE_SAFARI
 	ld [wBattleType], a

engine/battle/safari_zone.asm

@@ -19,7 +19,7 @@ PrintSafariZoneBattleText:
 	ld [wd0b5], a
 	call GetMonHeader
 	ld a, [wMonHCatchRate]
-	ld [wEnemyMonCatchRate], a
+	ld [wEnemyMonActualCatchRate], a
 	pop hl
 .asm_429f
 	push hl