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

# Conflicts: # constants/map_constants.asm # constants/wram_constants.asm # data/radio/oaks_pkmn_talk_routes.asm # data/radio/pnp_hidden_places.asm # engine/battle/core.asm # engine/breeding.asm # engine/phone/phone_scripts.asm # engine/radio.asm # maps/BattleTower1F.asm # maps/OlivineLighthouse2F.asm # maps/OlivineLighthouse6F.asm # maps/PokemonFanClub.asm # maps/RadioTower1F.asm # maps/RadioTower2F.asm # maps/Route30BerryHouse.asm # maps/Route34IlexForestGate.asm # maps/Route36NationalParkGate.asm # maps/RuinsOfAlphKabutoChamber.asm # maps/RuinsOfAlphResearchCenter.asm # maps/VermilionPort.asm # maps/VictoryRoad.asm
pret · Feb 26, 2018 · 335c269 · 335c269
2 parents 10173f2 + f44f306
commit 335c269
Show file tree

Hide file tree

Showing 98 changed files with 1,325 additions and 1,278 deletions.
diff --git a/Makefile b/Makefile
@@ -238,8 +238,6 @@ gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
 	$(if $(tools/gfx),\
 		tools/gfx $(tools/gfx) -d1 -o $@ $@)
 
-%.tilemap: %.png
-	$(RGBGFX) -t $@ $<
 %.gbcpal: %.png
 	$(RGBGFX) -p $@ $<
 %.dimensions: %.png

diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
@@ -1,7 +1,7 @@
 BATTLETOWER_PARTY_LENGTH EQU 3
 BATTLETOWER_STREAK_LENGTH EQU 7
 
-BATTLETOWER_NUM_UNIQUE_PKMN EQU 21
+BATTLETOWER_NUM_UNIQUE_MON EQU 21
 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
 
 BATTLETOWER_TRAINERDATALENGTH EQU $24

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm
@@ -97,7 +97,7 @@
 ; PlayRadio.StationPointers indexes (see engine/pokegear.asm)
 	const_def
 	const MAPRADIO_POKEMON_CHANNEL
-	const MAPRADIO_OAKS_MON_TALK
+	const MAPRADIO_OAKS_POKEMON_TALK
 	const MAPRADIO_POKEDEX_SHOW
 	const MAPRADIO_POKEMON_MUSIC
 	const MAPRADIO_LUCKY_CHANNEL
@@ -108,8 +108,8 @@
 
 ; These tables in engine/radio.asm are all sized to a power of 2
 ; so there's no need for a rejection sampling loop
-NUM_OAKS_MON_TALK_ADVERBS    EQU 16 ; OaksPkmnTalk8.Adverbs
-NUM_OAKS_MON_TALK_ADJECTIVES EQU 16 ; OaksPkmnTalk9.Adjectives
+NUM_OAKS_POKEMON_TALK_ADVERBS    EQU 16 ; OaksPKMNTalk8.Adverbs
+NUM_OAKS_POKEMON_TALK_ADJECTIVES EQU 16 ; OaksPKMNTalk9.Adjectives
 NUM_PNP_PEOPLE_ADJECTIVES    EQU 16 ; PeoplePlaces5.Adjectives
 NUM_PNP_PLACES_ADJECTIVES    EQU 16 ; PeoplePlaces7.Adjectives
 

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
@@ -84,6 +84,8 @@ FACE_RIGHT   EQU 1
 ; wPokemonWithdrawDepositParameter:: ; d10b
 PC_WITHDRAW       EQU 0
 PC_DEPOSIT        EQU 1
+REMOVE_PARTY      EQU 0
+REMOVE_BOX        EQU 1
 DAY_CARE_WITHDRAW EQU 2
 DAY_CARE_DEPOSIT  EQU 3
 

diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
@@ -15,19 +15,19 @@ PredefPointers:: ; 856b
 	add_predef FillPP
 	add_predef TryAddMonToParty
 	add_predef AddTempmonToParty
-	add_predef SendGetPkmnIntoFromBox
-	add_predef SendPkmnIntoBox
+	add_predef SendGetMonIntoFromBox
+	add_predef SendMonIntoBox
 	add_predef GiveEgg
 	add_predef AnimateHPBar
-	add_predef CalcPkmnStats
-	add_predef CalcPkmnStatC
+	add_predef CalcMonStats
+	add_predef CalcMonStatC
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
 	add_predef LinkTextboxAtHL ; $ 10
 	add_predef PrintMoveDesc
 	add_predef UpdatePlayerHUD
 	add_predef PlaceGraphic
-	add_predef CheckPlayerPartyForFitPkmn
+	add_predef CheckPlayerPartyForFitMon
 	add_predef UpdateEnemyHUD
 	add_predef StartBattle
 	add_predef FillInExpBar
@@ -38,7 +38,7 @@ PredefPointers:: ; 856b
 	add_predef EvolveAfterBattle
 	add_predef TradeAnimationPlayer2
 	add_predef TradeAnimation
-	add_predef CopyPkmnToTempMon
+	add_predef CopyMonToTempMon
 	add_predef ListMoves ; $20
 	add_predef PlaceNonFaintStatus
 	add_predef Unused_PlaceEnemyHPLevel

diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm
@@ -1,6 +1,6 @@
 ; Oak's Pokémon Talk will list wild Pokémon on these maps.
 
-OaksPkmnTalkRoutes:
+OaksPKMNTalkRoutes:
 	map_id ROUTE_29
 	map_id ROUTE_46
 	map_id ROUTE_30

diff --git a/data/text/battle.asm b/data/text/battle.asm
@@ -137,14 +137,14 @@ BattleText_SafeguardFaded: ; 0x808d2
 	prompt
 ; 0x808e7
 
-BattleText_PkmnLightScreenFell: ; 0x808e7
+BattleText_MonsLightScreenFell: ; 0x808e7
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "LIGHT SCREEN fell!"
 	prompt
 ; 0x80905
 
-BattleText_PkmnReflectFaded: ; 0x80905
+BattleText_MonsReflectFaded: ; 0x80905
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "REFLECT faded!"
@@ -186,7 +186,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f
 	prompt
 ; 0x809a8
 
-BattleText_EnemyPkmnFainted: ; 0x809a8
+BattleText_EnemyMonFainted: ; 0x809a8
 	text "Enemy @"
 	text_from_ram wEnemyMonNick
 	text_start
@@ -236,7 +236,7 @@ BattleText_0x80a4f: ; 0x80a4f
 	prompt
 ; 0x80a75
 
-BattleText_PkmnFainted: ; 0x80a75
+BattleText_MonFainted: ; 0x80a75
 	text_from_ram wBattleMonNick
 	text_start
 	line "fainted!"
@@ -261,7 +261,7 @@ LostAgainstText: ; 0x80ab9
 	prompt
 ; 0x80aca
 
-BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
+BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
@@ -353,14 +353,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3
 	prompt
 ; 0x80c0d
 
-BattleText_PkmnIsAlreadyOut: ; 0x80c0d
+BattleText_MonIsAlreadyOut: ; 0x80c0d
 	text_from_ram wBattleMonNick
 	text_start
 	line "is already out."
 	prompt
 ; 0x80c22
 
-BattleText_PkmnCantBeRecalled: ; 0x80c22
+BattleText_MonCantBeRecalled: ; 0x80c22
 	text_from_ram wBattleMonNick
 	text_start
 	line "can't be recalled!"
@@ -379,7 +379,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b
 	prompt
 ; 0x80c72
 
-BattleText_PkmnHasNoMovesLeft: ; 0x80c72
+BattleText_MonHasNoMovesLeft: ; 0x80c72
 	text_from_ram wBattleMonNick
 	text_start
 	line "has no moves left!"
@@ -402,15 +402,15 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
 	db "@@"
 ; 0x80cb9
 
-BattleText_WildPkmnIsEating: ; 0x80cba
+BattleText_WildMonIsEating: ; 0x80cba
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "is eating!"
 	prompt
 ; 0x80cd1
 
-BattleText_WildPkmnIsAngry: ; 0x80cd1
+BattleText_WildMonIsAngry: ; 0x80cd1
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start

diff --git a/data/text/common_1.asm b/data/text/common_1.asm
@@ -1121,7 +1121,7 @@ Text_RemainingTime::
 	text "Remaining Time"
 	done
 
-Text_YourPkmnsHPWasHealed::
+Text_YourMonsHPWasHealed::
 	text "Your #MON's HP"
 	line "was healed."
 	prompt

diff --git a/data/text/common_2.asm b/data/text/common_2.asm
@@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints::
 	text " EXP. Points!"
 	prompt
 
-Text_GoPkmn::
+Text_GoMon::
 	text "Go! @@"
 
-Text_DoItPkmn::
+Text_DoItMon::
 	text "Do it! @@"
 
-Text_GoForItPkmn::
+Text_GoForItMon::
 	text "Go for it,"
 	line "@@"
 
-Text_YourFoesWeakGetmPkmn::
+Text_YourFoesWeakGetmMon::
 	text "Your foe's weak!"
 	line "Get'm, @@"
 
@@ -618,7 +618,7 @@ UnknownText_0x1c0bee::
 	cont "time to use that!"
 	prompt
 
-Text_YouDontHaveAPkmn::
+Text_YouDontHaveAMon::
 	text "You don't have a"
 	line "#MON!"
 	prompt

diff --git a/data/text/common_3.asm b/data/text/common_3.asm
@@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3::
 	para ""
 	done
 
-Text_OnlyThreePkmnMayBeEntered::
+Text_OnlyThreeMonMayBeEntered::
 	text "Only three #MON"
 	line "may be entered."
 
 	para ""
 	done
 
-Text_ThePkmnMustAllBeDifferentKinds::
+Text_TheMonMustAllBeDifferentKinds::
 	text "The @"
 	text_from_ram wStringBuffer2
 	text " #MON"
@@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
 	para ""
 	done
 
-Text_ThePkmnMustNotHoldTheSameItems::
+Text_TheMonMustNotHoldTheSameItems::
 	text "The @"
 	text_from_ram wStringBuffer2
 	text " #MON"

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
@@ -260,7 +260,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 	ret nz
 
 .force_struggle
-	ld hl, BattleText_PkmnHasNoMovesLeft
+	ld hl, BattleText_MonHasNoMovesLeft
 	call StdBattleTextBox
 	ld c, 60
 	call DelayFrames

diff --git a/docs/images/hp_exp_bar_border_fix.png b/docs/images/hp_exp_bar_border_fix.png
diff --git a/docs/images/port_fix.png b/docs/images/port_fix.png
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
@@ -74,7 +74,7 @@ SwitchOften: ; 38045
 	ld a, [wEnemySwitchMonParam]
 	and $f
 	inc a
-	; In register 'a' is the number (1-6) of the Pkmn to switch to
+	; In register 'a' is the number (1-6) of the mon to switch to
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
 ; 38083