Merge pull request #268 from yenatch/master

remove preprocessor

Makefile

@@ -8,7 +8,6 @@ PYTHON := python
 poketools := extras/pokemontools
 gfx       := $(PYTHON) $(poketools)/gfx.py
 includes  := $(PYTHON) $(poketools)/scan_includes.py
-pre       := $(PYTHON) prequeue.py
 
 
 crystal_obj := \
@@ -48,14 +47,11 @@ baserom.gbc: ;
 
 
 %.asm: ;
-%.tx: %.asm ; $(eval txq += $<) @rm -f $@
-
-$(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep))
-	@$(pre) $(txq);        $(eval txq :=)
+$(all_obj): $$*.asm $$($$*_dep)
 	@$(gfx) 2bpp $(2bppq); $(eval 2bppq :=)
 	@$(gfx) 1bpp $(1bppq); $(eval 1bppq :=)
 	@$(gfx) lz   $(lzq);   $(eval lzq   :=)
-	rgbasm -o $@ $*.tx
+	rgbasm -o $@ $<
 
 pokecrystal.gbc: $(crystal_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^

battle/anim_commands.asm

@@ -35,7 +35,7 @@ _PlayBattleAnim: ; cc0e4
 	ld c, 3
 
 .asm_cc0ff
-	ld hl, $ff9e
+	ld hl, hVBlank
 	ld a, [hl]
 	push af
 
@@ -43,7 +43,7 @@ _PlayBattleAnim: ; cc0e4
 	call Functioncc11c
 
 	pop af
-	ld [$ff9e], a
+	ld [hVBlank], a
 
 	ld a, $1
 	ld [hBGMapMode], a

engine/buena_scripts.asm

@@ -3,36 +3,36 @@ UnknownScript_0xa0b14:
 	iftrue UnknownScript_0xa0b73
 	checkcode $a
 	if_greater_than $11, UnknownScript_0xa0b4b
-	2call UnknownScript_0xa0b32
-	2jump UnknownScript_0xa0c0e
+	scall UnknownScript_0xa0b32
+	jump UnknownScript_0xa0c0e
 
 UnknownScript_0xa0b26:
 	checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
 	iftrue UnknownScript_0xa0b73
-	2call UnknownScript_0xa0b4f
-	2jump UnknownScript_0xa0b77
+	scall UnknownScript_0xa0b4f
+	jump UnknownScript_0xa0b77
 
 UnknownScript_0xa0b32:
 	checktime $1
 	iftrue UnknownScript_0xa0b41
 	checktime $2
 	iftrue UnknownScript_0xa0b46
-	2writetext UnknownText_0xa0d42
+	writetext UnknownText_0xa0d42
 	keeptextopen
 	end
 
 UnknownScript_0xa0b41:
-	2writetext UnknownText_0xa0c28
+	writetext UnknownText_0xa0c28
 	keeptextopen
 	end
 
 UnknownScript_0xa0b46:
-	2writetext UnknownText_0xa0c72
+	writetext UnknownText_0xa0c72
 	keeptextopen
 	end
 
 UnknownScript_0xa0b4b:
-	2writetext UnknownText_0xa0caf
+	writetext UnknownText_0xa0caf
 	end
 
 UnknownScript_0xa0b4f:
@@ -42,34 +42,34 @@ UnknownScript_0xa0b4f:
 	iftrue UnknownScript_0xa0b64
 	checktime $2
 	iftrue UnknownScript_0xa0b69
-	2writetext UnknownText_0xa0e29
+	writetext UnknownText_0xa0e29
 	keeptextopen
 	end
 
 UnknownScript_0xa0b64:
-	2writetext UnknownText_0xa0d96
+	writetext UnknownText_0xa0d96
 	keeptextopen
 	end
 
 UnknownScript_0xa0b69:
-	2writetext UnknownText_0xa0dcf
+	writetext UnknownText_0xa0dcf
 	keeptextopen
 	end
 
 UnknownScript_0xa0b6e:
-	2writetext UnknownText_0xa0e01
+	writetext UnknownText_0xa0e01
 	keeptextopen
 	end
 
 UnknownScript_0xa0b73:
-	2writetext UnknownText_0xa0e5e
+	writetext UnknownText_0xa0e5e
 	end
 
 UnknownScript_0xa0b77:
 	checkevent $0044
 	iftrue UnknownScript_0xa0b82
 	random $b
-	2jump UnknownScript_0xa0b84
+	jump UnknownScript_0xa0b84
 
 UnknownScript_0xa0b82:
 	random $e
@@ -91,59 +91,59 @@ UnknownScript_0xa0b84:
 	if_equal $d, UnknownScript_0xa0c0a
 
 UnknownScript_0xa0bbc:
-	2writetext UnknownText_0xa0efb
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa0efb
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bc2:
-	2writetext UnknownText_0xa0fcf
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa0fcf
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bc8:
-	2writetext UnknownText_0xa109d
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa109d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bce:
-	2writetext UnknownText_0xa1143
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1143
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bd4:
-	2writetext UnknownText_0xa1244
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1244
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bda:
-	2writetext UnknownText_0xa1318
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1318
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0be0:
-	2writetext UnknownText_0xa13d8
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa13d8
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0be6:
-	2writetext UnknownText_0xa1488
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1488
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bec:
-	2writetext UnknownText_0xa15de
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa15de
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bf2:
-	2writetext UnknownText_0xa1717
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1717
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bf8:
-	2writetext UnknownText_0xa183d
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa183d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bfe:
-	2writetext UnknownText_0xa19b1
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa19b1
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0c04:
-	2writetext UnknownText_0xa1ac0
-	2jump UnknownScript_0xa0c0d
+	writetext UnknownText_0xa1ac0
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0c0a:
-	2writetext UnknownText_0xa1bed
+	writetext UnknownText_0xa1bed
 
 UnknownScript_0xa0c0d:
 	end
@@ -155,14 +155,14 @@ UnknownScript_0xa0c0e:
 	if_equal $2, UnknownScript_0xa0c24
 
 UnknownScript_0xa0c1c:
-	2writetext UnknownText_0xa1c88
+	writetext UnknownText_0xa1c88
 	end
 
 UnknownScript_0xa0c20:
-	2writetext UnknownText_0xa1d5f
+	writetext UnknownText_0xa1d5f
 	end
 
 UnknownScript_0xa0c24:
-	2writetext UnknownText_0xa1e2f
+	writetext UnknownText_0xa1e2f
 	end
 ; a0c28

engine/color.asm

@@ -190,7 +190,7 @@ Function8b4d: ; 8b4d
 	ld a, [hSGB]
 	and a
 	ret z
-	ld hl, $5c26
+	ld hl, PalPacket_9c26
 	jp Function9809
 
 .asm_8b5c
@@ -206,7 +206,7 @@ Function8b67: ; 8b67
 	ld a, [hSGB]
 	and a
 	ret z
-	ld hl, $5c36
+	ld hl, PalPacket_9c36
 	jp Function9809
 
 .asm_8b76
@@ -2155,6 +2155,7 @@ Palettes_b469: ; b469
 	RGB 31, 07, 01
 	RGB 00, 00, 00
 
+Palette_b471::
 	RGB 28, 31, 16
 	RGB 31, 19, 10
 	RGB 10, 09, 31

engine/credits.asm

@@ -188,10 +188,10 @@ Function109847:: ; 109847
 
 	call GetCreditsPalette
 	call Function32f9
-	ld a, [$ff9e]
+	ld a, [hVBlank]
 	push af
 	ld a, $5
-	ld [$ff9e], a
+	ld [hVBlank], a
 	ld a, $1
 	ld [$ffaa], a
 	xor a
@@ -215,7 +215,7 @@ Function109847:: ; 109847
 	ld [hLCDStatCustom], a
 	ld [hBGMapAddress], a
 	pop af
-	ld [$ff9e], a
+	ld [hVBlank], a
 	pop af
 	ld [rSVBK], a
 	ret
@@ -258,8 +258,8 @@ Function109926: ; 109926
 	ld a, [$cf63]
 	and $f
 	ld e, a
-	ld d, $0
-	ld hl, $5937
+	ld d, 0
+	ld hl, Jumptable_109937
 	add hl, de
 	add hl, de
 	ld a, [hli]

engine/events.asm

@@ -929,13 +929,13 @@ CheckMenuOW: ; 96b30
 
 
 StartMenuScript: ; 96b58
-	3callasm StartMenu
-	2jump StartMenuCallback
+	callasm StartMenu
+	jump StartMenuCallback
 ; 96b5f
 
 SelectMenuScript: ; 96b5f
-	3callasm SelectMenu
-	2jump SelectMenuCallback
+	callasm SelectMenu
+	jump SelectMenuCallback
 ; 96b66
 
 StartMenuCallback:
@@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66
 ; 96b72
 
 .Script ; 96b72
-	2ptjump $d0e8
+	ptjump $d0e8
 ; 96b75
 
 .Asm ; 96b75
-	2ptcallasm $d0e8
+	ptcallasm $d0e8
 	end
 ; 96b79
 
@@ -1081,7 +1081,7 @@ UnknownScript_0x96c2e: ; 96c2e
 ; 96c2f
 
 UnknownScript_0x96c2f: ; 96c2f
-	3callasm Function16f5e
+	callasm Function16f5e
 	end
 ; 96c34
 
@@ -1096,7 +1096,7 @@ FallIntoMapScript: ; 96c38
 	playsound SFX_KINESIS
 	applymovement $0, MovementData_0x96c48
 	playsound SFX_STRENGTH
-	2call UnknownScript_0x96c4a
+	scall UnknownScript_0x96c4a
 	end
 ; 96c48
 
@@ -1116,7 +1116,7 @@ UnknownScript_0x96c4d: ; 96c4d
 
 UnknownScript_0x96c4f: ; 96c4f
 	deactivatefacing $3
-	3callasm Function96706
+	callasm Function96706
 	end
 ; 96c56
 

engine/fruit_trees.asm

@@ -1,32 +1,32 @@
 FruitTreeScript:: ; 44000
-	3callasm GetCurTreeFruit
+	callasm GetCurTreeFruit
 	loadfont
 	copybytetovar CurFruit
 	itemtotext $0, $0
-	2writetext FruitBearingTreeText
+	writetext FruitBearingTreeText
 	keeptextopen
-	3callasm TryResetFruitTrees
-	3callasm CheckFruitTree
+	callasm TryResetFruitTrees
+	callasm CheckFruitTree
 	iffalse .fruit
-	2writetext NothingHereText
+	writetext NothingHereText
 	closetext
-	2jump .end
+	jump .end
 
 .fruit
-	2writetext HeyItsFruitText
+	writetext HeyItsFruitText
 	copybytetovar CurFruit
 	giveitem $ff, 1
 	iffalse .packisfull
 	keeptextopen
-	2writetext ObtainedFruitText
-	3callasm PickedFruitTree
+	writetext ObtainedFruitText
+	callasm PickedFruitTree
 	specialsound
 	itemnotify
-	2jump .end
+	jump .end
 
 .packisfull
 	keeptextopen
-	2writetext FruitPackIsFullText
+	writetext FruitPackIsFullText
 	closetext
 
 .end

engine/scripting.asm

@@ -572,8 +572,8 @@ Function96f76: ; 96f76
 ; 96f77
 
 GiveItemScript: ; 96f77
-	3callasm Function96f76
-	2writetext ReceivedItemText
+	callasm Function96f76
+	writetext ReceivedItemText
 	iffalse .Full
 	waitbutton
 	specialsound

home/vblank.asm

@@ -13,13 +13,11 @@ VBlank:: ; 283
 	push de
 	push hl
 
-; get vblank type
-	ld a, [$ff9e]
-	and $7
+	ld a, [hVBlank]
+	and 7
 
-; get fn pointer
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld hl, .VBlanks
 	add hl, de
 	add hl, de
@@ -27,10 +25,8 @@ VBlank:: ; 283
 	ld h, [hl]
 	ld l, a
 
-; down to business
 	call _hl_
 
-; since this is called once per frame
 	call GameTimer
 
 	pop hl
@@ -41,14 +37,14 @@ VBlank:: ; 283
 ; 2a1
 
 .VBlanks ; 2a1
-	dw VBlank0 ; 0
-	dw VBlank1 ; 1
-	dw VBlank2 ; 2
-	dw VBlank3 ; 3
-	dw VBlank4 ; 4
-	dw VBlank5 ; 5
-	dw VBlank6 ; 6
-	dw VBlank0 ; 7
+	dw VBlank0
+	dw VBlank1
+	dw VBlank2
+	dw VBlank3
+	dw VBlank4
+	dw VBlank5
+	dw VBlank6
+	dw VBlank0 ; just in case
 ; 2b1
 
 
@@ -70,7 +66,7 @@ VBlank0:: ; 2b1
 	ld hl, $ff9b
 	inc [hl]
 
-; advance rng
+	; advance random variables
 	ld a, [rDIV]
 	ld b, a
 	ld a, [hRandomAdd]
@@ -83,97 +79,71 @@ VBlank0:: ; 2b1
 	sbc b
 	ld [hRandomSub], a
 
-; save bank
-	ld a, [hROMBank] ; current bank
-	ld [$ff8a], a
+	ld a, [hROMBank]
+	ld [hROMBankBackup], a
 
-; scroll x
 	ld a, [hSCX]
 	ld [rSCX], a
-; scroll y
 	ld a, [hSCY]
 	ld [rSCY], a
-; window y
 	ld a, [hWY]
 	ld [rWY], a
-; window x + 7
 	ld a, [hWX]
 	ld [rWX], a
 
-; some time management is in order
-; only have time for one of these during vblank
+	; There's only time to call one of these in one vblank.
+	; Calls are in order of priority.
 
-; bg map buffer has priority
 	call UpdateBGMapBuffer
-	jr c, .doneframeaction
-	
-; then pals
+	jr c, .done
 	call UpdatePalsIfCGB
-	jr c, .doneframeaction
-	
-; dma transfer
+	jr c, .done
 	call DMATransfer
-	jr c, .doneframeaction
-	
-; bg map
+	jr c, .done
 	call UpdateBGMap
 
-; these have their own timing checks
+	; These have their own timing checks.
+
 	call Serve2bppRequest
 	call Serve1bppRequest
 	call AnimateTileset
 
-.doneframeaction
-; oam update off?
+.done
+
 	ld a, [hOAMUpdate]
 	and a
-	jr nz, .vblankoccurred
-	
-; update oam by dma transfer
+	jr nz, .done_oam
 	call hPushOAM
-;	@PushOAM:
-;		ld a, Sprites >> 8
-;		ld [rDMA], a
-;		ld a, $28
-;	.loop
-;		dec a
-;		jr nz, .loop
-;		ret
+.done_oam
 
 
 	; vblank-sensitive operations are done
 
-.vblankoccurred
-; tell other fns vblank happened
 	xor a
 	ld [VBlankOccurred], a
 
-; dec OverworldDelay until 0
 	ld a, [OverworldDelay]
 	and a
-	jr z, .textdelay
+	jr z, .ok
 	dec a
 	ld [OverworldDelay], a
+.ok
 
-.textdelay
-; dec text delay counter until 0
 	ld a, [TextDelayFrames]
 	and a
-	jr z, .joypad
+	jr z, .ok2
 	dec a
 	ld [TextDelayFrames], a
+.ok2
 
-.joypad
 	call Joypad
 
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
-	ld a, [$ff8a]
-	rst Bankswitch ; restore bank
+	ld a, [hROMBankBackup]
+	rst Bankswitch
 
-; 
 	ld a, [hSeconds]
 	ld [$ffe3], a
 
@@ -184,20 +154,16 @@ VBlank0:: ; 2b1
 VBlank2:: ; 325
 ; sound only
 
-; save bank
 	ld a, [hROMBank]
-	ld [$ff8a], a
+	ld [hROMBankBackup], a
 
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
 
-; restore bank
-	ld a, [$ff8a]
+	ld a, [hROMBankBackup]
 	rst Bankswitch
 
-; tell other fns vblank happened
 	xor a
 	ld [VBlankOccurred], a
 	ret
@@ -212,38 +178,23 @@ VBlank1:: ; 337
 ; oam
 ; sound / lcd stat
 
-; save bank
 	ld a, [hROMBank]
-	ld [$ff8a], a
+	ld [hROMBankBackup], a
 
-; scroll x
 	ld a, [hSCX]
 	ld [rSCX], a
-	
-; scroll y
 	ld a, [hSCY]
 	ld [rSCY], a
 
-; time-sensitive fns
 	call UpdatePals
-	jr c, .vblankoccurred
+	jr c, .done
 
-; these have their own timing checks
 	call UpdateBGMap
 	call Serve2bppRequest@VBlank
-; update oam by dma transfer
-	call hPushOAM
-;	@PushOAM:
-;		ld a, Sprites >> 8
-;		ld [rDMA], a
-;		ld a, $28
-;	.loop
-;		dec a
-;		jr nz, .loop
-;		ret
 
-.vblankoccurred
-; tell other fns vblank happened
+	call hPushOAM
+.done
+
 	xor a
 	ld [VBlankOccurred], a
 
@@ -264,12 +215,10 @@ VBlank1:: ; 337
 	ld [rIF], a
 
 	ei
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
-; restore bank
-	ld a, [$ff8a]
+	ld a, [hROMBankBackup]
 	rst Bankswitch
 	di
 
@@ -292,7 +241,6 @@ VBlank1:: ; 337
 UpdatePals:: ; 37f
 ; update pals for either dmg or cgb
 
-; check cgb
 	ld a, [hCGB]
 	and a
 	jp nz, UpdateCGBPals
@@ -300,10 +248,8 @@ UpdatePals:: ; 37f
 	; update gb pals
 	ld a, [$cfc7]
 	ld [rBGP], a
-	
 	ld a, [$cfc8]
 	ld [rOBP0], a
-	
 	ld a, [$cfc9]
 	ld [rOBP1], a
 
@@ -320,60 +266,41 @@ VBlank3:: ; 396
 ; oam
 ; sound / lcd stat
 
-; save bank
 	ld a, [hROMBank]
-	ld [$ff8a], a
+	ld [hROMBankBackup], a
 
-; scroll x
 	ld a, [hSCX]
 	ld [rSCX], a
-; scroll y
 	ld a, [hSCY]
 	ld [rSCY], a
 
-; any pals to update?
 	ld a, [hCGBPalUpdate]
 	and a
 	call nz, ForceUpdateCGBPals
-	jr c, .vblankoccurred
-; else
+	jr c, .done
+
 	call UpdateBGMap
 	call Serve2bppRequest@VBlank
 
-; update oam by dma transfer
 	call hPushOAM
-;	@PushOAM:
-;		ld a, Sprites >> 8
-;		ld [rDMA], a
-;		ld a, $28
-;	.loop
-;		dec a
-;		jr nz, .loop
-;		ret
+.done
 
-.vblankoccurred
-; tell other fns vblank happened
 	xor a
 	ld [VBlankOccurred], a
 
-; save int flag
 	ld a, [rIF]
 	push af
-; reset ints
 	xor a
 	ld [rIF], a
-; force lcdstat int during sound update
 	ld a, %10 ; lcd stat
 	ld [rIE], a
 	ld [rIF], a
 
 	ei
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
-; restore bank
-	ld a, [$ff8a]
+	ld a, [hROMBankBackup]
 	rst Bankswitch
 	di
 
@@ -405,40 +332,26 @@ VBlank4:: ; 3df
 ; serial
 ; sound
 
-; save bank
 	ld a, [hROMBank]
-	ld [$ff8a], a
+	ld [hROMBankBackup], a
 
 	call UpdateBGMap
 	call Serve2bppRequest
 
-; update oam by dma transfer
 	call hPushOAM
-;	@PushOAM:
-;		ld a, Sprites >> 8
-;		ld [rDMA], a
-;		ld a, $28
-;	.loop
-;		dec a
-;		jr nz, .loop
-;		ret
 
-; update joypad
 	call Joypad
 
-; tell other fns vblank happened
 	xor a
 	ld [VBlankOccurred], a
 
-; handshake
 	call AskSerial
 
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
-; restore bank
-	ld a, [$ff8a]
+
+	ld a, [hROMBankBackup]
 	rst Bankswitch
 	ret
 ; 400
@@ -452,49 +365,39 @@ VBlank5:: ; 400
 ; joypad
 ; 
 
-; save bank
 	ld a, [hROMBank]
-	ld [$ff8a], a
+	ld [hROMBankBackup], a
 
-; scroll x
 	ld a, [hSCX]
 	ld [rSCX], a
 
-; if we can update pals, skip this part
 	call UpdatePalsIfCGB
-	jr c, .vblankoccurred
+	jr c, .done
 
 	call UpdateBGMap
 	call Serve2bppRequest
+.done
 
-.vblankoccurred
-; tell other fns vblank happened
 	xor a
 	ld [VBlankOccurred], a
 
-; joypad
 	call Joypad
 
-; discard requested ints
 	xor a
 	ld [rIF], a
-; enable lcd stat
 	ld a, %10 ; lcd stat
 	ld [rIE], a
 	; request lcd stat
 	ld [rIF], a
 
 	ei
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
-; restore bank
-	ld a, [$ff8a]
+	ld a, [hROMBankBackup]
 	rst Bankswitch
 	di
 
-; discard requested ints
 	xor a
 	ld [rIF], a
 	; enable ints besides joypad
@@ -510,32 +413,29 @@ VBlank6:: ; 436
 ; dma transfer
 ; sound
 
-; save bank
 	ld a, [hROMBank]
-	ld [$ff8a], a
+	ld [hROMBankBackup], a
 
 	; inc frame counter
 	ld hl, $ff9b
 	inc [hl]
 
 	call UpdateCGBPals
-	jr c, .vblankoccurred
+	jr c, .done
 
 	call Serve2bppRequest
 	call Serve1bppRequest
 	call DMATransfer
+.done
 
-.vblankoccurred
-; tell other fns vblank happened
 	xor a
 	ld [VBlankOccurred], a
 
-; update sound
 	ld a, BANK(_UpdateSound)
-	rst Bankswitch ; bankswitch
+	rst Bankswitch
 	call _UpdateSound
-; restore bank
-	ld a, [$ff8a]
+
+	ld a, [hROMBankBackup]
 	rst Bankswitch
 	ret
 ; 45a

hram.asm

@@ -1,5 +1,6 @@
 hPushOAM           EQU $ff80
 
+hROMBankBackup     EQU $ff8a
 hBuffer            EQU $ff8b
 
 hRTCDayHi          EQU $ff8d
@@ -15,6 +16,7 @@ hMinutes           EQU $ff96
 hSeconds           EQU $ff98
 
 hROMBank           EQU $ff9d
+hVBlank            EQU $ff9e
 
 hJoypadReleased    EQU $ffa2
 hJoypadPressed     EQU $ffa3

lib/mobile/main.asm

@@ -2368,23 +2368,23 @@ Function110f07: ; 110f07
 ; 110fad
 
 URIPrefix: ; 0x110fad
-	ascii "http://"
+	db "http://"
 URIPrefixEnd
 
 HTTPDownloadURL: ; 0x110fb4
-	ascii "gameboy.datacenter.ne.jp/cgb/download"
+	db "gameboy.datacenter.ne.jp/cgb/download"
 HTTPDownloadURLEnd
 
 HTTPUploadURL: ; 0x110fd9
-	ascii "gameboy.datacenter.ne.jp/cgb/upload"
+	db "gameboy.datacenter.ne.jp/cgb/upload"
 HTTPUploadURLEnd
 
 HTTPUtilityURL: ; 0x110ffc
-	ascii "gameboy.datacenter.ne.jp/cgb/utility"
+	db "gameboy.datacenter.ne.jp/cgb/utility"
 HTTPUtilityURLEnd
 
 HTTPRankingURL: ; 0x111020
-	ascii "gameboy.datacenter.ne.jp/cgb/ranking"
+	db "gameboy.datacenter.ne.jp/cgb/ranking"
 HTTPRankingURLEnd
 
 Function111044: ; 111044
@@ -4920,41 +4920,41 @@ Unknown_112089: ; 112089
 INCBIN "baserom.gbc", $112089, $11209e - $112089
 
 Unknown_11209e:
-	ascii "HELO ", $0
+	db "HELO ", 0
 Unknown_1120a4:
-	ascii "MAIL FROM:<", $0
+	db "MAIL FROM:<", 0
 Unknown_1120b0:
-	ascii "RCPT TO:<", $0
+	db "RCPT TO:<", 0
 Unknown_1120ba:
-	ascii "DATA", $d, "\n", $0
+	db "DATA", $d, "\n", 0
 Unknown_1120c1:
-	ascii "QUIT", $d, "\n", $0
+	db "QUIT", $d, "\n", 0
 Unknown_1120c8:
-	ascii "USER ", $0
+	db "USER ", 0
 Unknown_1120ce:
-	ascii "PASS ", $0
+	db "PASS ", 0
 Unknown_1120d4:
-	ascii "STAT", $d, "\n", $0
+	db "STAT", $d, "\n", 0
 Unknown_1120db:
-	ascii "LIST 00000", $d, "\n", $0
+	db "LIST 00000", $d, "\n", 0
 Unknown_1120e8:
-	ascii "RETR 00000", $d, "\n", $0
+	db "RETR 00000", $d, "\n", 0
 Unknown_1120f5:
-	ascii "DELE 00000", $d, "\n", $0
+	db "DELE 00000", $d, "\n", 0
 Unknown_112102:
-	ascii "TOP 00000 0", $d, "\n", $0
+	db "TOP 00000 0", $d, "\n", 0
 Unknown_112110:
-	ascii "GET ", $0
+	db "GET ", 0
 Unknown_112115:
-	ascii " HTTP/1.0", $d, "\n", $0
+	db " HTTP/1.0", $d, "\n", 0
 Unknown_112121:
-	ascii "User-Agent: CGB-", $0
+	db "User-Agent: CGB-", 0
 Unknown_112132:
-	ascii $d, "\n", $d, "\n", $0
+	db $d, "\n", $d, "\n", 0
 Unknown_112137:
-	ascii "POST ", $0
+	db "POST ", 0
 Unknown_11213d:
-	ascii "Content-Length: ", $0
+	db "Content-Length: ", 0
 ; 11214e
 
 Function11214e: ; 11214e (44:614e)
@@ -7308,7 +7308,7 @@ Function112fd5: ; 112fd5
 ; 113001
 
 Unknown_113001: ; 113001
-	ascii "date: ", $0
+	db "date: ", 0
 ; 113008
 
 Function113008: ; 113008
@@ -7802,17 +7802,17 @@ Function11329d: ; 11329d
 ; 1132a6
 
 Unknown_1132a6:
-	ascii "Gb-Status: ", $0
+	db "Gb-Status: ", 0
 Unknown_1132b2:
-	ascii "Gb-Auth-ID: ", $0
+	db "Gb-Auth-ID: ", 0
 Unknown_1132bf:
-	ascii "WWW-Authenticate: GB00 name=", $22, $0
+	db "WWW-Authenticate: GB00 name=", $22, 0
 Unknown_1132dd:
-	ascii "Content-Type: application/x-cgb", $d, "\n", $0
+	db "Content-Type: application/x-cgb", $d, "\n", 0
 Unknown_1132ff:
-	ascii "URI-header: ", $0
+	db "URI-header: ", 0
 Unknown_11330c:
-	ascii "Location: ", $0
+	db "Location: ", 0
 ; 113317
 
 Function113317: ; 113317
@@ -7865,7 +7865,7 @@ Function113317: ; 113317
 ; 113372
 
 Unknown_113372: ; 113372
-	ascii "Content-Length: 0", $d, "\n", $0
+	db "Content-Length: 0", $d, "\n", 0
 ; 113386
 
 Function113386: ; 113386
@@ -9017,7 +9017,7 @@ Function113a40: ; 113a40
 ; 113a55
 
 Unknown_113a55: ; 113a55
-	ascii "Authorization: GB00 name=", $22, $0
+	db "Authorization: GB00 name=", $22, 0
 ; 113a70
 
 INCBIN "baserom.gbc", $113a70, $113b70 - $113a70

macros.asm

@@ -1,3 +1,12 @@
+INCLUDE "macros/event.asm"
+INCLUDE "macros/sound.asm"
+INCLUDE "macros/text.asm"
+INCLUDE "macros/charmap.asm"
+INCLUDE "macros/move_effect.asm"
+INCLUDE "macros/move_anim.asm"
+INCLUDE "macros/movement.asm"
+INCLUDE "macros/map.asm"
+
 
 text   EQUS "db $00," ; Start writing text.
 next   EQUS "db $4e," ; Move a line down.
@@ -39,6 +48,11 @@ dbbw: MACRO
 	dw \3
 	ENDM
 
+dbwww: MACRO
+	db \1
+	dw \2, \3, \4
+	ENDM
+
 dn: MACRO
 	db (\1) << 4 + (\2)
 	ENDM
@@ -103,6 +117,18 @@ note: MACRO
 	db (\1) << 4 + ((\2) - 1)
 	ENDM
 
+sound: macro
+	db \1 ; duration
+	db \2 ; intensity
+	dw \3 ; frequency
+	endm
+
+noise: macro
+	db \1 ; duration
+	db \2 ; intensity
+	db \3 ; frequency
+	endm
+
 ; pitch
 __ EQU 0
 C_ EQU 1

macros/charmap.asm

@@ -0,0 +1,275 @@
+	charmap "@", $50
+
+	charmap "#", $54
+	charmap "№", $74
+	charmap "…", $75
+	charmap "┌", $79
+	charmap "─", $7a
+	charmap "┐", $7b
+	charmap "│", $7c
+	charmap "└", $7d
+	charmap "┘", $7e
+	charmap " ", $7f
+
+	charmap "A", $80
+	charmap "B", $81
+	charmap "C", $82
+	charmap "D", $83
+	charmap "E", $84
+	charmap "F", $85
+	charmap "G", $86
+	charmap "H", $87
+	charmap "I", $88
+	charmap "J", $89
+	charmap "K", $8a
+	charmap "L", $8b
+	charmap "M", $8c
+	charmap "N", $8d
+	charmap "O", $8e
+	charmap "P", $8f
+	charmap "Q", $90
+	charmap "R", $91
+	charmap "S", $92
+	charmap "T", $93
+	charmap "U", $94
+	charmap "V", $95
+	charmap "W", $96
+	charmap "X", $97
+	charmap "Y", $98
+	charmap "Z", $99
+
+	charmap "(", $9a
+	charmap ")", $9b
+	charmap ":", $9c
+	charmap ";", $9d
+	charmap "[", $9e
+	charmap "]", $9f
+
+	charmap "a", $a0
+	charmap "b", $a1
+	charmap "c", $a2
+	charmap "d", $a3
+	charmap "e", $a4
+	charmap "f", $a5
+	charmap "g", $a6
+	charmap "h", $a7
+	charmap "i", $a8
+	charmap "j", $a9
+	charmap "k", $aa
+	charmap "l", $ab
+	charmap "m", $ac
+	charmap "n", $ad
+	charmap "o", $ae
+	charmap "p", $af
+	charmap "q", $b0
+	charmap "r", $b1
+	charmap "s", $b2
+	charmap "t", $b3
+	charmap "u", $b4
+	charmap "v", $b5
+	charmap "w", $b6
+	charmap "x", $b7
+	charmap "y", $b8
+	charmap "z", $b9
+
+	charmap "Ä", $c0
+	charmap "Ö", $c1
+	charmap "Ü", $c2
+	charmap "ä", $c3
+	charmap "ö", $c4
+	charmap "ü", $c5
+
+	charmap "'d", $d0
+	charmap "'l", $d1
+	charmap "'m", $d2
+	charmap "'r", $d3
+	charmap "'s", $d4
+	charmap "'t", $d5
+	charmap "'v", $d6
+
+	charmap "'", $e0
+	charmap "-", $e3
+
+	charmap "?", $e6
+	charmap "!", $e7
+	charmap ".", $e8
+	charmap "&", $e9
+
+	charmap "é", $ea
+	charmap "→", $eb
+	charmap "▷", $ec
+	charmap "▶", $ed
+	charmap "▼", $ee
+	charmap "♂", $ef
+	charmap "¥", $f0
+	charmap "×", $f1
+	charmap "/", $f3
+	charmap ",", $f4
+	charmap "♀", $f5
+
+	charmap "0", $f6
+	charmap "1", $f7
+	charmap "2", $f8
+	charmap "3", $f9
+	charmap "4", $fa
+	charmap "5", $fb
+	charmap "6", $fc
+	charmap "7", $fd
+	charmap "8", $fe
+	charmap "9", $ff
+
+	charmap "ガ", $5
+	charmap "ギ", $6
+	charmap "グ", $7
+	charmap "ゲ", $8
+	charmap "ゴ", $9
+	charmap "ザ", $a
+	charmap "ジ", $b
+	charmap "ズ", $c
+	charmap "ゼ", $d
+	charmap "ゾ", $e
+	charmap "ダ", $f
+	charmap "ヂ", $10
+	charmap "ヅ", $11
+	charmap "デ", $12
+	charmap "ド", $13
+
+	charmap "バ", $19
+	charmap "ビ", $1a
+	charmap "ブ", $1b
+	charmap "ボ", $1c
+
+	charmap "が", $26
+	charmap "ぎ", $27
+	charmap "ぐ", $28
+	charmap "げ", $29
+	charmap "ご", $2a
+	charmap "ざ", $2b
+	charmap "じ", $2c
+	charmap "ず", $2d
+	charmap "ぜ", $2e
+	charmap "ぞ", $2f
+	charmap "だ", $30
+	charmap "ぢ", $31
+	charmap "づ", $32
+	charmap "で", $33
+	charmap "ど", $34
+
+	charmap "ば", $3a
+	charmap "び", $3b
+	charmap "ぶ", $3c
+	charmap "べ", $3d
+	charmap "ぼ", $3e
+
+	charmap "パ", $40
+	charmap "ピ", $41
+	charmap "プ", $42
+	charmap "ポ", $43
+	charmap "ぱ", $44
+	charmap "ぴ", $45
+	charmap "ぷ", $46
+	charmap "ぺ", $47
+	charmap "ぽ", $48
+
+	charmap "ア", $80
+	charmap "イ", $81
+	charmap "ウ", $82
+	charmap "エ", $83
+	charmap "ォ", $84
+	charmap "カ", $85
+	charmap "キ", $86
+	charmap "ク", $87
+	charmap "ケ", $88
+	charmap "コ", $89
+	charmap "サ", $8a
+	charmap "シ", $8b
+	charmap "ス", $8c
+	charmap "セ", $8d
+	charmap "ソ", $8e
+	charmap "タ", $8f
+	charmap "チ", $90
+	charmap "ツ", $91
+	charmap "テ", $92
+	charmap "ト", $93
+	charmap "ナ", $94
+	charmap "ニ", $95
+	charmap "ヌ", $96
+	charmap "ネ", $97
+	charmap "ノ", $98
+	charmap "ハ", $99
+	charmap "ヒ", $9a
+	charmap "フ", $9b
+	charmap "ホ", $9c
+	charmap "マ", $9d
+	charmap "ミ", $9e
+	charmap "ム", $9f
+	charmap "メ", $a0
+	charmap "モ", $a1
+	charmap "ヤ", $a2
+	charmap "ユ", $a3
+	charmap "ヨ", $a4
+	charmap "ラ", $a5
+	charmap "ル", $a6
+	charmap "レ", $a7
+	charmap "ロ", $a8
+	charmap "ワ", $a9
+	charmap "ヲ", $aa
+	charmap "ン", $ab
+	charmap "ッ", $ac
+	charmap "ャ", $ad
+	charmap "ュ", $ae
+	charmap "ョ", $af
+	charmap "ィ", $b0
+	charmap "あ", $b1
+	charmap "い", $b2
+	charmap "う", $b3
+	charmap "え", $b4
+	charmap "お", $b5
+	charmap "か", $b6
+	charmap "き", $b7
+	charmap "く", $b8
+	charmap "け", $b9
+	charmap "こ", $ba
+	charmap "さ", $bb
+	charmap "し", $bc
+	charmap "す", $bd
+	charmap "せ", $be
+	charmap "そ", $bf
+	charmap "た", $c0
+	charmap "ち", $c1
+	charmap "つ", $c2
+	charmap "て", $c3
+	charmap "と", $c4
+	charmap "な", $c5
+	charmap "に", $c6
+	charmap "ぬ", $c7
+	charmap "ね", $c8
+	charmap "の", $c9
+	charmap "は", $ca
+	charmap "ひ", $cb
+	charmap "ふ", $cc
+	charmap "へ", $cd
+	charmap "ほ", $ce
+	charmap "ま", $cf
+	charmap "み", $d0
+	charmap "む", $d1
+	charmap "め", $d2
+	charmap "も", $d3
+	charmap "や", $d4
+	charmap "ゆ", $d5
+	charmap "よ", $d6
+	charmap "ら", $d7
+	charmap "り", $d8
+	charmap "る", $d9
+	charmap "れ", $da
+	charmap "ろ", $db
+	charmap "わ", $dc
+	charmap "を", $dd
+	charmap "ん", $de
+	charmap "っ", $df
+	charmap "ゃ", $e0
+	charmap "ゅ", $e1
+	charmap "ょ", $e2
+	charmap "ー", $e3
+
+	charmap "ァ", $e9

macros/map.asm

@@ -0,0 +1,40 @@
+person_event: macro
+	db \1 ; sprite
+	db \2 ; y
+	db \3 ; x
+	db \4 ; facing
+	db \5 ; movement
+	db \6 ; clock_hour
+	db \7 ; clock_daytime
+	db \8 ; color_function
+	db \9 ; sight_range
+	shift
+	dw \9 ; pointer
+	shift
+	dw \9 ; event flag
+	endm
+
+signpost: macro
+	db \1 ; y
+	db \2 ; x
+	db \3 ; function
+	dw \4 ; pointer
+	endm
+
+xy_trigger: macro
+	db \1 ; number
+	db \2 ; y
+	db \3 ; x
+	db \4 ; unknown1
+	dw \5 ; script
+	db \6 ; unknown2
+	db \7 ; unknown3
+	endm
+
+warp_def: macro
+	db \1 ; y
+	db \2 ; x
+	db \3 ; warp_to
+	db \4 ; map group
+	db \5 ; map number
+	endm