Factor out tables into data/overworld/

Fixes #749

engine/overworld/variables.asm

@@ -6,7 +6,7 @@ _GetVarAction::
 .valid
 	ld c, a
 	ld b, 0
-	ld hl, .VarActionTable
+	ld hl, VarActionTable
 	add hl, bc
 	add hl, bc
 	add hl, bc
@@ -17,100 +17,68 @@ _GetVarAction::
 	ld b, [hl]
 	ld a, b
 	and RETVAR_EXECUTE
-	jr nz, .call
+	jr nz, .call_de
 	ld a, b
 	and RETVAR_ADDR_DE
 	ret nz
 	ld a, [de]
-	jr .loadstringbuffer2
+	jr LoadStringBuffer2
 
-.call
+.call_de
 	call _de_
 	ret
 
-.loadstringbuffer2
+LoadStringBuffer2:
 	ld de, wStringBuffer2
 	ld [de], a
 	ret
 
-.VarActionTable:
-; entries correspond to VAR_* constants
-	; RETVAR_STRBUF2: copy [de] to wStringBuffer2
-	; RETVAR_ADDR_DE: return address in de
-	; RETVAR_EXECUTE: call function
-	dwb wStringBuffer2,                 RETVAR_STRBUF2
-	dwb wPartyCount,                    RETVAR_STRBUF2
-	dwb .BattleResult,                  RETVAR_EXECUTE
-	dwb wBattleType,                    RETVAR_ADDR_DE
-	dwb wTimeOfDay,                     RETVAR_STRBUF2
-	dwb .CountCaughtMons,               RETVAR_EXECUTE
-	dwb .CountSeenMons,                 RETVAR_EXECUTE
-	dwb .CountBadges,                   RETVAR_EXECUTE
-	dwb wPlayerState,                   RETVAR_ADDR_DE
-	dwb .PlayerFacing,                  RETVAR_EXECUTE
-	dwb hHours,                         RETVAR_STRBUF2
-	dwb .DayOfWeek,                     RETVAR_EXECUTE
-	dwb wMapGroup,                      RETVAR_STRBUF2
-	dwb wMapNumber,                     RETVAR_STRBUF2
-	dwb .UnownCaught,                   RETVAR_EXECUTE
-	dwb wEnvironment,                   RETVAR_STRBUF2
-	dwb .BoxFreeSpace,                  RETVAR_EXECUTE
-	dwb wBugContestMinsRemaining,       RETVAR_STRBUF2
-	dwb wXCoord,                        RETVAR_STRBUF2
-	dwb wYCoord,                        RETVAR_STRBUF2
-	dwb wSpecialPhoneCallID,            RETVAR_STRBUF2
-	dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2
-	dwb wKurtApricornQuantity,          RETVAR_STRBUF2
-	dwb wCurCaller,                     RETVAR_ADDR_DE
-	dwb wBlueCardBalance,               RETVAR_ADDR_DE
-	dwb wBuenasPassword,                RETVAR_ADDR_DE
-	dwb wKenjiBreakTimer,               RETVAR_STRBUF2
-	dwb NULL,                           RETVAR_STRBUF2
+INCLUDE "data/overworld/variables.asm"
 
-.CountCaughtMons:
+Var_CountCaughtMons:
 ; Caught mons.
 	ld hl, wPokedexCaught
 	ld b, wEndPokedexCaught - wPokedexCaught
 	call CountSetBits
 	ld a, [wNumSetBits]
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.CountSeenMons:
+Var_CountSeenMons:
 ; Seen mons.
 	ld hl, wPokedexSeen
 	ld b, wEndPokedexSeen - wPokedexSeen
 	call CountSetBits
 	ld a, [wNumSetBits]
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.CountBadges:
+Var_CountBadges:
 ; Number of owned badges.
 	ld hl, wBadges
 	ld b, 2
 	call CountSetBits
 	ld a, [wNumSetBits]
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.PlayerFacing:
+Var_PlayerFacing:
 ; The direction the player is facing.
 	ld a, [wPlayerDirection]
 	and $c
 	rrca
 	rrca
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.DayOfWeek:
+Var_DayOfWeek:
 ; The day of the week.
 	call GetWeekday
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.UnownCaught:
+Var_UnownCaught:
 ; Number of unique Unown caught.
 	call .count_unown
 	ld a, b
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.count_unown
+.count_unown:
 	ld hl, wUnownDex
 	ld b, 0
 .loop
@@ -123,7 +91,7 @@ _GetVarAction::
 	jr c, .loop
 	ret
 
-.BoxFreeSpace:
+Var_BoxFreeSpace:
 ; Remaining slots in the current box.
 	ld a, BANK(sBoxCount)
 	call OpenSRAM
@@ -133,9 +101,10 @@ _GetVarAction::
 	ld b, a
 	call CloseSRAM
 	ld a, b
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2
 
-.BattleResult:
+Var_BattleResult:
+; Outcome of the last battle.
 	ld a, [wBattleResult]
 	and $ff ^ BATTLERESULT_BITMASK
-	jp .loadstringbuffer2
+	jp LoadStringBuffer2