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

35 files changed, 37 insertions, 37 deletions

diff --git a/engine/events/heal_party.asm b/engine/events/heal_party.asm
index e6551bcd..5532fd92 100644
--- a/engine/events/heal_party.asm
+++ b/engine/events/heal_party.asm
@@ -11,7 +11,7 @@ HealParty:
 	push hl
 	push de
 
-	ld hl, wPartyMon1Status - wPartyMon1HP
+	ld hl, MON_STATUS - MON_HP
 	add hl, de
 	xor a
 	ld [hl], a
@@ -19,7 +19,7 @@ HealParty:
 	push de
 	ld b, NUM_MOVES ; A Pokémon has 4 moves
 .pp
-	ld hl, wPartyMon1Moves - wPartyMon1HP
+	ld hl, MON_MOVES - MON_HP
 	add hl, de
 
 	ld a, [hl]
@@ -27,7 +27,7 @@ HealParty:
 	jr z, .nextmove
 
 	dec a
-	ld hl, wPartyMon1PP - wPartyMon1HP
+	ld hl, MON_PP - MON_HP
 	add hl, de
 
 	push hl
@@ -60,7 +60,7 @@ HealParty:
 	jr nz, .pp
 	pop de
 
-	ld hl, wPartyMon1MaxHP - wPartyMon1HP
+	ld hl, MON_MAXHP - MON_HP
 	add hl, de
 	ld a, [hli]
 	ld [de], a
@@ -72,7 +72,7 @@ HealParty:
 	pop hl
 
 	push hl
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld h, d
 	ld l, e
 	add hl, bc
diff --git a/engine/events/hidden_objects/bench_guys.asm b/engine/events/hidden_events/bench_guys.asm
index 81519f2f..81519f2f 100644
--- a/engine/events/hidden_objects/bench_guys.asm
+++ b/engine/events/hidden_events/bench_guys.asm
diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_events/bills_house_pc.asm
index fefb66dd..fefb66dd 100644
--- a/engine/events/hidden_objects/bills_house_pc.asm
+++ b/engine/events/hidden_events/bills_house_pc.asm
diff --git a/engine/events/hidden_objects/blues_room.asm b/engine/events/hidden_events/blues_room.asm
index bcbad556..bcbad556 100644
--- a/engine/events/hidden_objects/blues_room.asm
+++ b/engine/events/hidden_events/blues_room.asm
diff --git a/engine/events/hidden_objects/book_or_sculpture.asm b/engine/events/hidden_events/book_or_sculpture.asm
index e04f4047..e04f4047 100644
--- a/engine/events/hidden_objects/book_or_sculpture.asm
+++ b/engine/events/hidden_events/book_or_sculpture.asm
diff --git a/engine/events/hidden_objects/bookshelves.asm b/engine/events/hidden_events/bookshelves.asm
index 813cfc49..813cfc49 100644
--- a/engine/events/hidden_objects/bookshelves.asm
+++ b/engine/events/hidden_events/bookshelves.asm
diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_events/cinnabar_gym_quiz.asm
index da280345..c76a97c8 100644
--- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm
+++ b/engine/events/hidden_events/cinnabar_gym_quiz.asm
@@ -11,7 +11,7 @@ CinnabarGymQuiz::
 	ld [wOpponentAfterWrongAnswer], a
 	ld hl, wd474
 	res 7, [hl]
-	ld a, [wHiddenObjectFunctionArgument]
+	ld a, [wHiddenEventFunctionArgument]
 	push af
 	and $f
 	ldh [hGymGateIndex], a
diff --git a/engine/events/hidden_objects/elevator.asm b/engine/events/hidden_events/elevator.asm
index ab0f731f..ab0f731f 100644
--- a/engine/events/hidden_objects/elevator.asm
+++ b/engine/events/hidden_events/elevator.asm
diff --git a/engine/events/hidden_objects/fanclub_pictures.asm b/engine/events/hidden_events/fanclub_pictures.asm
index 2a3db4bc..2a3db4bc 100644
--- a/engine/events/hidden_objects/fanclub_pictures.asm
+++ b/engine/events/hidden_events/fanclub_pictures.asm
diff --git a/engine/events/hidden_objects/fighting_dojo.asm b/engine/events/hidden_events/fighting_dojo.asm
index b4f89985..b4f89985 100644
--- a/engine/events/hidden_objects/fighting_dojo.asm
+++ b/engine/events/hidden_events/fighting_dojo.asm
diff --git a/engine/events/hidden_objects/gym_statues.asm b/engine/events/hidden_events/gym_statues.asm
index 1c7eb970..1c7eb970 100644
--- a/engine/events/hidden_objects/gym_statues.asm
+++ b/engine/events/hidden_events/gym_statues.asm
diff --git a/engine/events/hidden_objects/indigo_plateau_hq.asm b/engine/events/hidden_events/indigo_plateau_hq.asm
index e8fd0220..e8fd0220 100644
--- a/engine/events/hidden_objects/indigo_plateau_hq.asm
+++ b/engine/events/hidden_events/indigo_plateau_hq.asm
diff --git a/engine/events/hidden_objects/indigo_plateau_statues.asm b/engine/events/hidden_events/indigo_plateau_statues.asm
index f78a5a72..f78a5a72 100644
--- a/engine/events/hidden_objects/indigo_plateau_statues.asm
+++ b/engine/events/hidden_events/indigo_plateau_statues.asm
diff --git a/engine/events/hidden_objects/magazines.asm b/engine/events/hidden_events/magazines.asm
index b58636ff..b58636ff 100644
--- a/engine/events/hidden_objects/magazines.asm
+++ b/engine/events/hidden_events/magazines.asm
diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_events/museum_fossils.asm
index 9e02aeba..9e02aeba 100644
--- a/engine/events/hidden_objects/museum_fossils.asm
+++ b/engine/events/hidden_events/museum_fossils.asm
diff --git a/engine/events/hidden_objects/museum_fossils2.asm b/engine/events/hidden_events/museum_fossils2.asm
index 240b7ece..240b7ece 100644
--- a/engine/events/hidden_objects/museum_fossils2.asm
+++ b/engine/events/hidden_events/museum_fossils2.asm
diff --git a/engine/events/hidden_objects/new_bike.asm b/engine/events/hidden_events/new_bike.asm
index 5bce5937..5bce5937 100644
--- a/engine/events/hidden_objects/new_bike.asm
+++ b/engine/events/hidden_events/new_bike.asm
diff --git a/engine/events/hidden_objects/oaks_lab_email.asm b/engine/events/hidden_events/oaks_lab_email.asm
index bd4c66d7..bd4c66d7 100644
--- a/engine/events/hidden_objects/oaks_lab_email.asm
+++ b/engine/events/hidden_events/oaks_lab_email.asm
diff --git a/engine/events/hidden_objects/oaks_lab_posters.asm b/engine/events/hidden_events/oaks_lab_posters.asm
index 502cf951..502cf951 100644
--- a/engine/events/hidden_objects/oaks_lab_posters.asm
+++ b/engine/events/hidden_events/oaks_lab_posters.asm
diff --git a/engine/events/hidden_objects/pokecenter_pc.asm b/engine/events/hidden_events/pokecenter_pc.asm
index 59867d1a..59867d1a 100644
--- a/engine/events/hidden_objects/pokecenter_pc.asm
+++ b/engine/events/hidden_events/pokecenter_pc.asm
diff --git a/engine/events/hidden_objects/pokemon_stuff.asm b/engine/events/hidden_events/pokemon_stuff.asm
index 267a191a..267a191a 100644
--- a/engine/events/hidden_objects/pokemon_stuff.asm
+++ b/engine/events/hidden_events/pokemon_stuff.asm
diff --git a/engine/events/hidden_objects/reds_room.asm b/engine/events/hidden_events/reds_room.asm
index 7b8d51a0..7b8d51a0 100644
--- a/engine/events/hidden_objects/reds_room.asm
+++ b/engine/events/hidden_events/reds_room.asm
diff --git a/engine/events/hidden_objects/route_15_binoculars.asm b/engine/events/hidden_events/route_15_binoculars.asm
index a9b8ca37..a9b8ca37 100644
--- a/engine/events/hidden_objects/route_15_binoculars.asm
+++ b/engine/events/hidden_events/route_15_binoculars.asm
diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_events/safari_game.asm
index 7fd59ea9..7fd59ea9 100644
--- a/engine/events/hidden_objects/safari_game.asm
+++ b/engine/events/hidden_events/safari_game.asm
diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_events/school_blackboard.asm
index 75811035..23022398 100644
--- a/engine/events/hidden_objects/school_blackboard.asm
+++ b/engine/events/hidden_events/school_blackboard.asm
@@ -2,7 +2,7 @@ PrintBlackboardLinkCableText:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, [wHiddenObjectFunctionArgument]
+	ld a, [wHiddenEventFunctionArgument]
 	call PrintPredefTextID
 	ret
 
diff --git a/engine/events/hidden_objects/school_notebooks.asm b/engine/events/hidden_events/school_notebooks.asm
index 96a44ab5..2387c089 100644
--- a/engine/events/hidden_objects/school_notebooks.asm
+++ b/engine/events/hidden_events/school_notebooks.asm
@@ -2,7 +2,7 @@ PrintNotebookText:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, [wHiddenObjectFunctionArgument]
+	ld a, [wHiddenEventFunctionArgument]
 	jp PrintPredefTextID
 
 TMNotebook::
diff --git a/engine/events/hidden_objects/town_map.asm b/engine/events/hidden_events/town_map.asm
index 11f7cbc7..11f7cbc7 100644
--- a/engine/events/hidden_objects/town_map.asm
+++ b/engine/events/hidden_events/town_map.asm
diff --git a/engine/events/hidden_objects/vermilion_gym_trash.asm b/engine/events/hidden_events/vermilion_gym_trash.asm
index 5f13a0e4..e83bef51 100644
--- a/engine/events/hidden_objects/vermilion_gym_trash.asm
+++ b/engine/events/hidden_events/vermilion_gym_trash.asm
@@ -8,7 +8,7 @@ VermilionGymTrashText::
 
 GymTrashScript:
 	call EnableAutoTextBoxDrawing
-	ld a, [wHiddenObjectFunctionArgument]
+	ld a, [wHiddenEventFunctionArgument]
 	ld [wGymTrashCanIndex], a
 
 ; Don't do the trash can puzzle if it's already been done.
diff --git a/engine/events/hidden_objects/vermilion_gym_trash2.asm b/engine/events/hidden_events/vermilion_gym_trash2.asm
index 1bc0590b..1bc0590b 100644
--- a/engine/events/hidden_objects/vermilion_gym_trash2.asm
+++ b/engine/events/hidden_events/vermilion_gym_trash2.asm
diff --git a/engine/events/hidden_items.asm b/engine/events/hidden_items.asm
index 62c40ce4..3ce8b716 100644
--- a/engine/events/hidden_items.asm
+++ b/engine/events/hidden_items.asm
@@ -13,7 +13,7 @@ HiddenItems:
 	call EnableAutoTextBoxDrawing
 	ld a, 1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, [wHiddenObjectFunctionArgument] ; item ID
+	ld a, [wHiddenEventFunctionArgument] ; item ID
 	ld [wNamedObjectIndex], a
 	call GetItemName
 	tx_pre_jump FoundHiddenItemText
@@ -28,7 +28,7 @@ INCLUDE "data/events/hidden_item_coords.asm"
 FoundHiddenItemText::
 	text_far _FoundHiddenItemText
 	text_asm
-	ld a, [wHiddenObjectFunctionArgument] ; item ID
+	ld a, [wHiddenEventFunctionArgument] ; item ID
 	ld b, a
 	ld c, 1
 	call GiveItem
@@ -75,7 +75,7 @@ HiddenCoins:
 	ldh [hUnusedCoinsByte], a
 	ldh [hCoins], a
 	ldh [hCoins + 1], a
-	ld a, [wHiddenObjectFunctionArgument]
+	ld a, [wHiddenEventFunctionArgument]
 	sub COIN
 	cp 10
 	jr z, .bcd10
@@ -143,9 +143,9 @@ DroppedHiddenCoinsText::
 	text_end
 
 FindHiddenItemOrCoinsIndex:
-	ld a, [wHiddenObjectY]
+	ld a, [wHiddenEventY]
 	ld d, a
-	ld a, [wHiddenObjectX]
+	ld a, [wHiddenEventX]
 	ld e, a
 	ld a, [wCurMap]
 	ld b, a
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index 8c5f4e5c..fab80ada 100644
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
@@ -106,7 +106,7 @@ InGameTrade_DoTrade:
 	jr nz, .tradeFailed ; jump if the selected mon's species is not the required one
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1Level
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
 	ld [wCurEnemyLevel], a
@@ -178,7 +178,7 @@ InGameTrade_PrepareTradeData:
 	ld de, wLinkEnemyTrainerName
 	call InGameTrade_CopyData
 	ld hl, wPartyMon1OTID
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld de, wTradedPlayerMonOTID
@@ -211,10 +211,10 @@ InGameTrade_CopyDataToReceivedMon:
 	ld bc, NAME_LENGTH
 	call CopyData
 	ld hl, wPartyMon1OTID
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call InGameTrade_GetReceivedMonPointer
 	ld hl, wTradedEnemyMonOTID
-	ld bc, $2
+	ld bc, 2
 	jp CopyData
 
 ; the received mon's index is (partyCount - 1),
diff --git a/engine/events/pick_up_item.asm b/engine/events/pick_up_item.asm
index 8fbdcfa2..a55c604a 100644
--- a/engine/events/pick_up_item.asm
+++ b/engine/events/pick_up_item.asm
@@ -3,19 +3,19 @@ PickUpItem:
 
 	ldh a, [hSpriteIndex]
 	ld b, a
-	ld hl, wMissableObjectList
-.missableObjectsListLoop
+	ld hl, wToggleableObjectList
+.toggleableObjectsListLoop
 	ld a, [hli]
 	cp $ff
 	ret z
 	cp b
-	jr z, .isMissable
+	jr z, .isToggleable
 	inc hl
-	jr .missableObjectsListLoop
+	jr .toggleableObjectsListLoop
 
-.isMissable
+.isToggleable
 	ld a, [hl]
-	ldh [hMissableObjectIndex], a
+	ldh [hToggleableObjectIndex], a
 
 	ld hl, wMapSpriteExtraData
 	ldh a, [hSpriteIndex]
@@ -30,8 +30,8 @@ PickUpItem:
 	call GiveItem
 	jr nc, .BagFull
 
-	ldh a, [hMissableObjectIndex]
-	ld [wMissableObjectIndex], a
+	ldh a, [hToggleableObjectIndex]
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, 1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
diff --git a/engine/events/poison.asm b/engine/events/poison.asm
index 6dfe1376..3a26df8f 100644
--- a/engine/events/poison.asm
+++ b/engine/events/poison.asm
@@ -78,7 +78,7 @@ ApplyOutOfBattlePoisonDamage:
 	ld a, [de]
 	inc a
 	jr z, .applyDamageLoopDone
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	push hl
 	ld hl, wWhichPokemon
@@ -95,7 +95,7 @@ ApplyOutOfBattlePoisonDamage:
 	and 1 << PSN
 	or e
 	ld e, a
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	dec d
 	jr nz, .countPoisonedLoop
diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm
index b280c711..cb25ab4c 100644
--- a/engine/events/pokemart.asm
+++ b/engine/events/pokemart.asm
@@ -99,7 +99,7 @@ DisplayPokemartDialogue_::
 	dec a
 	jr z, .sellMenuLoop
 
-.sellItem
+; sell item
 	ld a, [wBoughtOrSoldItemInMart]
 	and a
 	jr nz, .skipSettingFlag1
@@ -177,7 +177,7 @@ DisplayPokemartDialogue_::
 	dec a
 	jr z, .buyMenuLoop
 
-.buyItem
+; buy item
 	call .isThereEnoughMoney
 	jr c, .notEnoughMoney
 	ld hl, wNumBagItems
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index 16ada216..8f25f272 100644
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -196,7 +196,7 @@ HandlePrizeChoice:
 .getMonName
 	call GetMonName
 .givePrize
-	ld hl, SoYouWantPrizeTextPtr
+	ld hl, SoYouWantPrizeText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem] ; yes/no answer (Y=0, N=1)
@@ -244,25 +244,25 @@ HandlePrizeChoice:
 	predef SubBCDPredef
 	jp PrintPrizePrice
 .bagFull
-	ld hl, PrizeRoomBagIsFullTextPtr
+	ld hl, PrizeRoomBagIsFullText
 	jp PrintText
 .notEnoughCoins
 	ld hl, SorryNeedMoreCoinsText
 	jp PrintText
 .printOhFineThen
-	ld hl, OhFineThenTextPtr
+	ld hl, OhFineThenText
 	jp PrintText
 
 UnknownPrizeData:
 ; XXX what's this?
 	db $00,$01,$00,$01,$00,$01,$00,$00,$01
 
-HereYouGoTextPtr:
+HereYouGoText: ; unreferenced
 	text_far _HereYouGoText
 	text_waitbutton
 	text_end
 
-SoYouWantPrizeTextPtr:
+SoYouWantPrizeText:
 	text_far _SoYouWantPrizeText
 	text_end
 
@@ -271,12 +271,12 @@ SorryNeedMoreCoinsText:
 	text_waitbutton
 	text_end
 
-PrizeRoomBagIsFullTextPtr:
+PrizeRoomBagIsFullText:
 	text_far _OopsYouDontHaveEnoughRoomText
 	text_waitbutton
 	text_end
 
-OhFineThenTextPtr:
+OhFineThenText:
 	text_far _OhFineThenText
 	text_waitbutton
 	text_end