5 files changed, 206 insertions, 214 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 983b3daf..20d75238 100755
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -36,7 +36,7 @@ Function437c:
 	ld hl, $5
 	add hl, bc
 	res 6, [hl]
-	ld a, [wda03]
+	ld a, [wXCoord]
 	ld e, a
 	ld hl, $10
 	add hl, bc
@@ -46,7 +46,7 @@ Function437c:
 	jr c, .asm_43b3
 	cp $c
 	jr nc, .asm_43b3
-	ld a, [wda02]
+	ld a, [wYCoord]
 	ld e, a
 	ld hl, $11
 	add hl, bc
@@ -62,7 +62,7 @@ Function437c:
 	ld hl, $5
 	add hl, bc
 	set 6, [hl]
-	ld a, [wda03]
+	ld a, [wXCoord]
 	ld e, a
 	ld hl, $14
 	add hl, bc
@@ -72,7 +72,7 @@ Function437c:
 	jr c, .asm_43df
 	cp $c
 	jr nc, .asm_43df
-	ld a, [wda02]
+	ld a, [wYCoord]
 	ld e, a
 	ld hl, $15
 	add hl, bc
@@ -760,7 +760,7 @@ Function5636: ; 5636 (1:5636)
 	ld e, [hl]
 	inc d
 	inc e
-	ld a, [wda03]
+	ld a, [wXCoord]
 	cp d
 	jr z, .asm_564f
 	jr nc, .asm_565e
@@ -768,7 +768,7 @@ Function5636: ; 5636 (1:5636)
 	cp d
 	jr c, .asm_565e
 .asm_564f
-	ld a, [wda02]
+	ld a, [wYCoord]
 	cp e
 	jr z, .asm_565c
 	jr nc, .asm_565e
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm
index 78939e47..306066ae 100755
--- a/engine/npc_movement.asm
+++ b/engine/npc_movement.asm
@@ -412,7 +412,7 @@ HasPersonReachedMovementLimit: ; 7183 (1:7183)
 IsPersonMovingOffEdgeOfScreen: ; 71cc (1:71cc)
 	ld hl, $10
 	add hl, bc
-	ld a, [wda03]
+	ld a, [wXCoord]
 	cp [hl]
 	jr z, .asm_71dd
 	jr nc, .asm_71f0
@@ -422,7 +422,7 @@ IsPersonMovingOffEdgeOfScreen: ; 71cc (1:71cc)
 .asm_71dd
 	ld hl, $11
 	add hl, bc
-	ld a, [wda02]
+	ld a, [wYCoord]
 	cp [hl]
 	jr z, .asm_71ee
 	jr nc, .asm_71f0
diff --git a/engine/predef.asm b/engine/predef.asm
index 8e75fc4b..4068e313 100755
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -30,73 +30,73 @@ IF DEF(SILVER)
 ENDC
 endm
 
-	predef_pointer $65e7, $65ad, $01 ; add_predef LearnMove ; $0
-	dwb $4031, $01                   ; add_predef Predef1 ; $1
-	predef_pointer $469d, $469b, $03 ; add_predef HealParty
-	predef_pointer $4661, $465f, $03 ; add_predef FlagPredef
-	predef_pointer $46de, $46dc, $03 ; add_predef ComputeHPBarPixels
-	predef_pointer $5a73, $5a71, $03 ; add_predef FillPP
-	predef_pointer $5892, $5890, $03 ; add_predef TryAddMonToParty
-	predef_pointer $5a9c, $5a9a, $03 ; add_predef AddTempmonToParty
-	predef_pointer $5b45, $5b43, $03 ; add_predef SentGetPkmnIntoFromBox
-	predef_pointer $5e74, $5e72, $03 ; add_predef SentPkmnIntoBox
-	predef_pointer $5f92, $5f90, $03 ; add_predef GiveEgg
-	predef_pointer $4725, $4723, $03 ; add_predef AnimateHPBar
-	predef_pointer $616d, $616b, $03 ; add_predef CalcPkmnStats
-	predef_pointer $6181, $617f, $03 ; add_predef CalcPkmnStatC
-	dwb $5a25, $04                   ; add_predef CanLearnTMHMMove
-	dwb $5a56, $04                   ; add_predef GetTMHMMove
-	dwb $4d88, $0a                   ; add_predef Predef_LinkTextbox ; $ 10
-	dwb $4943, $0b                   ; add_predef PrintMoveDesc
-	dwb $5da9, $0f                   ; add_predef UpdatePlayerHUD
-	dwb $4648, $11                   ; add_predef PlaceGraphic
-	dwb $570a, $0f                   ; add_predef CheckPlayerPartyForFitPkmn
-	dwb $5e97, $0f                   ; add_predef UpdateEnemyHUD
-	dwb $72c7, $0f                   ; add_predef StartBattle
-	dwb $7196, $0f                   ; add_predef FillInExpBar
-	dwb $7243, $0f                   ; add_predef GetMonBackpic ; $18
-	dwb $7282, $0f                   ; add_predef GetMonFrontpic
-	dwb $6483, $10                   ; add_predef LearnLevelMoves
-	dwb $64dd, $10                   ; add_predef FillMoves
-	dwb $61e9, $10                   ; add_predef EvolveAfterBattle
-	dwb $4e22, $0a                   ; add_predef TradeAnimationPlayer2
-	dwb $4dea, $0a                   ; add_predef TradeAnimation
-	dwb $487d, $14                   ; add_predef CopyPkmnToTempMon
-	dwb $5478, $14                   ; add_predef ListMoves ; $20
-	dwb $5437, $14                   ; add_predef PlaceNonFaintStatus
-	dwb $53e4, $14                   ; add_predef Predef22
-	dwb $5364, $14                   ; add_predef ListMovePP
-	dwb $52f1, $14                   ; add_predef GetGender
-	dwb $4bae, $14                   ; add_predef StatsScreenInit
-	dwb $4b3d, $14                   ; add_predef DrawPlayerHP
-	dwb $4b41, $14                   ; add_predef DrawEnemyHP
-	dwb $528f, $14                   ; add_predef PrintTempMonStats ; $28
-	dwb $4997, $14                   ; add_predef GetTypeName
-	dwb $496d, $14                   ; add_predef PrintMoveType
-	dwb $4986, $14                   ; add_predef PrintType
-	dwb $4940, $14                   ; add_predef PrintMonTypes
-	dwb $5749, $14                   ; add_predef GetUnownLetter
-	dwb $7c76, $32                   ; add_predef LoadPoisonBGPals
-	dwb $40d6, $32                   ; add_predef Predef2F
-	dwb $5cc0, $02                   ; add_predef InitSGBBorder ; $30
-	dwb $4c2d, $02                   ; add_predef Predef_LoadSGBLayout
-	dwb $5c7f, $24                   ; add_predef Area_
-	dwb $5072, $02                   ; add_predef CheckContestMon
-	dwb $4513, $23                   ; add_predef Predef_StartBattle
-	dwb $4355, $23                   ; add_predef Predef35
-	dwb $4355, $23                   ; add_predef Predef36
-	dwb $40d7, $33                   ; add_predef PlayBattleAnim
-	dwb $40d6, $33                   ; add_predef Predef38 ; $38
-	dwb $40d6, $33                   ; add_predef Predef39
-	dwb $4001, $3f                   ; add_predef Predef3A
-	dwb $6e33, $04                   ; add_predef PartyMonItemName
-	dwb $5780, $14                   ; add_predef GetFrontpic
-	dwb $5803, $14                   ; add_predef GetBackpic
-	dwb $58a0, $14                   ; add_predef FrontpicPredef
-	dwb $58fa, $14                   ; add_predef GetTrainerPic
-	dwb $4923, $0d                   ; add_predef DecompressPredef ; $40
-	dwb $7a12, $3e                   ; add_predef CheckTypeMatchup
-	dwb $7981, $3e                   ; add_predef ConvertMon_1to2
-	dwb $5786, $14                   ; add_predef NewPokedexEntry
-	dwb $4a66, $70
+	add_predef LearnMove ; $0
+	add_predef Predef1 ; $1
+	add_predef HealParty
+	add_predef FlagPredef
+	add_predef ComputeHPBarPixels
+	add_predef FillPP
+	add_predef TryAddMonToParty
+	add_predef AddTempmonToParty
+	add_predef SentGetPkmnIntoFromBox
+	add_predef SentPkmnIntoBox
+	add_predef GiveEgg
+	add_predef AnimateHPBar
+	add_predef CalcPkmnStats
+	add_predef CalcPkmnStatC
+	add_predef CanLearnTMHMMove
+	add_predef GetTMHMMove
+	add_predef Predef_LinkTextbox ; $ 10
+	add_predef PrintMoveDesc
+	add_predef UpdatePlayerHUD
+	add_predef PlaceGraphic
+	add_predef CheckPlayerPartyForFitPkmn
+	add_predef UpdateEnemyHUD
+	add_predef StartBattle
+	add_predef FillInExpBar
+	add_predef GetMonBackpic ; $18
+	add_predef GetMonFrontpic
+	add_predef LearnLevelMoves
+	add_predef FillMoves
+	add_predef EvolveAfterBattle
+	add_predef TradeAnimationPlayer2
+	add_predef TradeAnimation
+	add_predef CopyPkmnToTempMon
+	add_predef ListMoves ; $20
+	add_predef PlaceNonFaintStatus
+	add_predef Predef22
+	add_predef ListMovePP
+	add_predef GetGender
+	add_predef StatsScreenInit
+	add_predef DrawPlayerHP
+	add_predef DrawEnemyHP
+	add_predef PrintTempMonStats ; $28
+	add_predef GetTypeName
+	add_predef PrintMoveType
+	add_predef PrintType
+	add_predef PrintMonTypes
+	add_predef GetUnownLetter
+	add_predef LoadPoisonBGPals
+	add_predef Predef2F
+	add_predef InitSGBBorder ; $30
+	add_predef Predef_LoadSGBLayout
+	add_predef Area_
+	add_predef CheckContestMon
+	add_predef Predef_StartBattle
+	add_predef Predef35
+	add_predef Predef36
+	add_predef PlayBattleAnim
+	add_predef Predef38 ; $38
+	add_predef Predef39
+	add_predef Predef3A
+	add_predef PartyMonItemName
+	add_predef GetFrontpic
+	add_predef GetBackpic
+	add_predef FrontpicPredef
+	add_predef GetTrainerPic
+	add_predef DecompressPredef ; $40
+	add_predef CheckTypeMatchup
+	add_predef ConvertMon_1to2
+	add_predef NewPokedexEntry
+	add_predef UpdateTimePredef
     dbw $ff, InexplicablyEmptyFunction
diff --git a/engine/specials.asm b/engine/specials.asm
index c4cf737e..09f9dfdb 100755
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -13,127 +13,118 @@ Special:: ; c22b
 	ret
 
 SpecialsPointers:
-special_pointer: MACRO
-IF DEF(GOLD)
-	dbw \1, \2
-ENDC
-IF DEF(SILVER)
-	dbw \1, \3
-ENDC
-ENDM
-
-	dbw $25, $7a59
-	dbw $0a, $5b22
-	dbw $0a, $5b4b
-	dbw $0a, $5bcc
-	dbw $0a, $5c71
-	dbw $0a, $5c8d
-	dbw $0a, $5d01
-	dbw $0a, $5cf9
-	dbw $0a, $5ad9
-	dbw $0a, $5b2b
-	dbw $0a, $5b34
-	dbw $0a, $5a47
-	dbw $0a, $5ac7
-	dbw $0a, $5ccf
-	dbw $0a, $5ce4
-	dbw $0a, $5cba
-	dbw $0a, $5d4e
-	dba Special_CheckMysteryGift
-	dba Special_GetMysteryGiftItem
-	dbw $0a, $64e7
-	dba BugContestJudging
-	dbw $31, $7bbf
-	dbw $04, $7dce
-	dbw $04, $7ded
-	dbw $04, $799d
-	dbw $3e, $7c3c
-	dbw $3e, $7dd6
-	dba HealParty
-	dbw $05, $5871
-	dba Special_PlayerPC
-	dbw $05, $6935
-	dbw $05, $6989
-	dbw $05, $6b8c
-	dbw $0b, $4352
-	dbw $05, $646d
-	dbw $23, $4e7c
-	dbw $03, $43f7
-	dbw $24, $48dc
-	dba Special_TownMap
-	dba Special_UnownPrinter
-	dba MapRadio
-	dba Special_UnownPuzzle
-	dba Special_SlotMachine
-	dba Special_CardFlip
-	dba Special_DummyNonfunctionalGameCornerGame
-	dba Special_ClearBGPalettesBufferScreen
-	dbw $23, $43ab
-	dbw $23, $43c4
-	dbw $23, $43a0
-	dbw $23, $43b9
-	dbw $02, Functiond42
-	dba ClearBGPalettes ; dbw $00, $3449
-	dba UpdateTimePals ; dbw $00, $0359
-	dba ClearTileMap ; dbw $00, $0ecf
-	dba UpdateSprites ; dbw $00, $196f
-	dba Functiond97 ; dbw $00, $0d97
-	dbw $03, $438a
-	dbw $03, $43ac
-	dbw $03, WaitSFX ; $3e56
-	dba PlayMapMusic ; dbw $00, $3ebd
-	dba RestartMapMusic ; dbw $00, $3f25
-	dbw $04, $66fd
-	dbw $02, $4969
-	dbw $03, $43b4
-	dbw $03, $43c2
-	dbw $03, $43d0
-	dbw $03, $43de
-	dba Special_CheckUnusedTwoDayTimer
-	dbw $05, $77a5
-	dbw $05, $77c4
-	dbw $04, $7d64
-	dba Functionc556
-	dbw $09, $71be
-	dbw $09, $7216
-	dba Function73e1 ; special_pointer $01, $73e1, $73a7
-	dba Function7452 ; special_pointer $01, $7452, $7418
-	dba Function74cb ; special_pointer $01, $74cb, $7491
-	dba Functionc588
-	dbw $09, $4a4d
-	dbw $09, $4a76
-	dbw $09, $4a10
-	dbw $31, $7a5a
-	dba Functionc5a3
-	dba Functionc591
-	dbw $31, $7bad
-	dba Functionc5bb
-	dba SpecialNameRater
-	dba Special_DisplayLinkRecord
-	dba GetFirstPokemonHappiness ; special_pointer $01, $726c, $7232
-	dba CheckFirstMonIsEgg ; special_pointer $01, $728b, $7251
-	dbw $0a, $69f7
-	dbw $0a, $6a6b
-	dbw $0a, $6ab3
-	dbw $05, $4226
-	dbw $3e, $794b
-	dba Functionc5d6
-	dba Function74e7 ; special_pointer $01, $74e7, $74ad
-	dba Function74ec ; special_pointer $01, $74ec, $74b2
-	dba Function74f1 ; special_pointer $01, $74f1, $74b7
-	dba Functionc60b
-	dbw $09, $67ca
-	dba Functionc611
-	dba Functionc652
-	dbw $05, $6ff7
-	dbw $0a, $67d7
-	dba Functionc628
-	dba Functionc638
-	dba Functionc645
-	dbw $24, $4a1b
-	dbw $24, $4a54
-	dbw $24, $4a8d
-	dba SpecialNone ; $03, $4389
+	add_special Function97a59
+	add_special Function29b22
+	add_special Function29b4b
+	add_special Function29bcc
+	add_special Function29c71
+	add_special Function29c8d
+	add_special Function29d01
+	add_special Function29cf9
+	add_special Function29ad9
+	add_special Function29b2b
+	add_special Function29b34
+	add_special Function29a47
+	add_special Function29ac7
+	add_special Function29ccf
+	add_special Function29ce4
+	add_special Function29cba
+	add_special Function29d4e
+	add_special Special_CheckMysteryGift
+	add_special Special_GetMysteryGiftItem
+	add_special Function2a4e7
+	add_special BugContestJudging
+	add_special Functionc7bbf
+	add_special Function13dce
+	add_special Function13ded
+	add_special Function1399d
+	add_special Functionfbc3c
+	add_special Functionfbdd6
+	add_special HealParty
+	add_special Function15871
+	add_special Special_PlayerPC
+	add_special Function16935
+	add_special Function16989
+	add_special Function16b8c
+	add_special Function2c352
+	add_special Function1646d
+	add_special Function8ce7c
+	add_special Special_NameRival
+	add_special Function908dc
+	add_special Special_TownMap
+	add_special Special_UnownPrinter
+	add_special MapRadio
+	add_special Special_UnownPuzzle
+	add_special Special_SlotMachine
+	add_special Special_CardFlip
+	add_special Special_DummyNonfunctionalGameCornerGame
+	add_special Special_ClearBGPalettesBufferScreen
+	add_special Function8c3ab
+	add_special Function8c3c4
+	add_special FadeInPalettes
+	add_special Function8c3b9
+	add_special Functiond42, $02
+	add_special ClearBGPalettes
+	add_special UpdateTimePals
+	add_special ClearTileMap
+	add_special UpdateSprites
+	add_special Functiond97
+	add_special Special_GameCornerPrizeMonCheckDex
+	add_special SpecialSeenMon
+	add_special WaitSFX, $03
+	add_special PlayMapMusic
+	add_special RestartMapMusic
+	add_special Function126fd
+	add_special Function8969
+	add_special Special_FindGreaterThanThatLevel
+	add_special Special_FindAtLeastThatHappy
+	add_special Special_FindThatSpecies
+	add_special Special_FindThatSpeciesYourTrainerID
+	add_special Special_CheckUnusedTwoDayTimer
+	add_special Function177a5
+	add_special Function177c4
+	add_special Function13d64
+	add_special Functionc556
+	add_special Function271be
+	add_special Function27216
+	add_special Function73e1
+	add_special Function7452
+	add_special Function74cb
+	add_special Functionc588
+	add_special Function24a4d
+	add_special Function24a76
+	add_special Function24a10
+	add_special Functionc7a5a
+	add_special Functionc5a3
+	add_special Functionc591
+	add_special Functionc7bad
+	add_special Functionc5bb
+	add_special SpecialNameRater
+	add_special Special_DisplayLinkRecord
+	add_special GetFirstPokemonHappiness
+	add_special CheckFirstMonIsEgg
+	add_special Function2a9f7
+	add_special Function2aa6b
+	add_special Function2aab3
+	add_special Function14226
+	add_special Functionfb94b
+	add_special Functionc5d6
+	add_special Function74e7
+	add_special Function74ec
+	add_special Function74f1
+	add_special Functionc60b
+	add_special Function267ca
+	add_special Functionc611
+	add_special Functionc652
+	add_special Function16ff7
+	add_special Function2a7d7
+	add_special Functionc628
+	add_special Functionc638
+	add_special Functionc645
+	add_special Function90a1b
+	add_special Function90a54
+	add_special Function90a8d
+	add_special SpecialNone
 
 SpecialNone: ; c389
 	ret
@@ -149,7 +140,7 @@ Special_GameCornerPrizeMonCheckDex: ; c38a
 	call FadeToMenu
 	ld a, [wScriptVar]
 	ld [wd151], a
-	callba Functionfb981
+	callba ConvertMon_1to2
 	call ExitAllMenus
 	ret
 
@@ -478,9 +469,9 @@ Functionc5d6: ; c5d6 (3:45d6)
 	ld a, [wChannelsEnd]
 	cp $40
 	jr nz, .asm_c5fb
-	ld a, [wda03]
+	ld a, [wXCoord]
 	ld b, a
-	ld a, [wda02]
+	ld a, [wYCoord]
 	ld c, a
 	ld hl, .ProximityCoords
 .asm_c5e8
@@ -566,8 +557,9 @@ Functionc652: ; c652 (3:4652)
 	ld [wScriptVar], a
 	jp CloseSRAM
 
-FlagPredef:
+Functionc660:
 	nop
+FlagPredef:
 	push hl
 	push bc
 	push bc
diff --git a/engine/variables.asm b/engine/variables.asm
index e352499f..4d67c2bf 100755
--- a/engine/variables.asm
+++ b/engine/variables.asm
@@ -35,26 +35,26 @@ GetVarAction_::
 
 .VarActionTable:
 	dwb wStringBuffer2, RETVAR_STRBUF2
-	dwb $da22, RETVAR_STRBUF2
+	dwb wPartyCount, RETVAR_STRBUF2
 	dwb .BattleResult, RETVAR_EXECUTE
-	dwb $d119, RETVAR_ADDR_DE
-	dwb $d157, RETVAR_STRBUF2
+	dwb wBattleType, RETVAR_ADDR_DE
+	dwb wTimeOfDay, RETVAR_STRBUF2
 	dwb .CountCaughtMons, RETVAR_EXECUTE
 	dwb .CountSeenMons, RETVAR_EXECUTE
 	dwb .CountBadges, RETVAR_EXECUTE
-	dwb $d682, RETVAR_ADDR_DE
+	dwb wPlayerBikeSurfState, RETVAR_ADDR_DE
 	dwb .PlayerFacing, RETVAR_EXECUTE
-	dwb $ff96, RETVAR_STRBUF2
+	dwb hHours, RETVAR_STRBUF2
 	dwb .DayOfWeek, RETVAR_EXECUTE
-	dwb $da00, RETVAR_STRBUF2
-	dwb $da01, RETVAR_STRBUF2
+	dwb wMapGroup, RETVAR_STRBUF2
+	dwb wMapNumber, RETVAR_STRBUF2
 	dwb .UnownCaught, RETVAR_EXECUTE
-	dwb $d083, RETVAR_STRBUF2
+	dwb wPermission, RETVAR_STRBUF2
 	dwb .BoxFreeSpace, RETVAR_EXECUTE
-	dwb $d193, RETVAR_STRBUF2
-	dwb $da03, RETVAR_STRBUF2
-	dwb $da02, RETVAR_STRBUF2
-	dwb $d97b, RETVAR_STRBUF2
+	dwb wBugContestMinsRemaining, RETVAR_STRBUF2
+	dwb wXCoord, RETVAR_STRBUF2
+	dwb wYCoord, RETVAR_STRBUF2
+	dwb wSpecialPhoneCallID, RETVAR_STRBUF2
     dwb     0, 0
 
 .CountCaughtMons: ; 41cf