Stop using the 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): $$*.asm $$($$*_dep)
-
-$(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep))
-	@$(pre) $(txq);        $(eval txq :=)
 	@$(gfx) 2bpp $(2bppq); $(eval 2bppq :=)
 	@$(gfx) 1bpp $(1bppq); $(eval 1bppq :=)
-	@$(gfx) lz $(lzq);     $(eval lzq   :=)
+	@$(gfx) lz   $(lzq);   $(eval lzq   :=)
-	rgbasm -o $@ $*.tx
+	rgbasm -o $@ $<
 
 pokecrystal.gbc: $(crystal_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^

engine/buena_scripts.asm

@@ -3,36 +3,36 @@ UnknownScript_0xa0b14:
 	iftrue UnknownScript_0xa0b73
 	checkcode $a
 	if_greater_than $11, UnknownScript_0xa0b4b
-	2call UnknownScript_0xa0b32
+	scall UnknownScript_0xa0b32
-	2jump UnknownScript_0xa0c0e
+	jump UnknownScript_0xa0c0e
 
 UnknownScript_0xa0b26:
 	checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
 	iftrue UnknownScript_0xa0b73
-	2call UnknownScript_0xa0b4f
+	scall UnknownScript_0xa0b4f
-	2jump UnknownScript_0xa0b77
+	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
+	writetext UnknownText_0xa0efb
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bc2:
-	2writetext UnknownText_0xa0fcf
+	writetext UnknownText_0xa0fcf
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bc8:
-	2writetext UnknownText_0xa109d
+	writetext UnknownText_0xa109d
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bce:
-	2writetext UnknownText_0xa1143
+	writetext UnknownText_0xa1143
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bd4:
-	2writetext UnknownText_0xa1244
+	writetext UnknownText_0xa1244
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bda:
-	2writetext UnknownText_0xa1318
+	writetext UnknownText_0xa1318
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0be0:
-	2writetext UnknownText_0xa13d8
+	writetext UnknownText_0xa13d8
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0be6:
-	2writetext UnknownText_0xa1488
+	writetext UnknownText_0xa1488
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bec:
-	2writetext UnknownText_0xa15de
+	writetext UnknownText_0xa15de
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bf2:
-	2writetext UnknownText_0xa1717
+	writetext UnknownText_0xa1717
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bf8:
-	2writetext UnknownText_0xa183d
+	writetext UnknownText_0xa183d
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0bfe:
-	2writetext UnknownText_0xa19b1
+	writetext UnknownText_0xa19b1
-	2jump UnknownScript_0xa0c0d
+	jump UnknownScript_0xa0c0d
 
 UnknownScript_0xa0c04:
-	2writetext UnknownText_0xa1ac0
+	writetext UnknownText_0xa1ac0
-	2jump UnknownScript_0xa0c0d
+	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/events.asm

@@ -929,13 +929,13 @@ CheckMenuOW: ; 96b30
 
 
 StartMenuScript: ; 96b58
-	3callasm StartMenu
+	callasm StartMenu
-	2jump StartMenuCallback
+	jump StartMenuCallback
 ; 96b5f
 
 SelectMenuScript: ; 96b5f
-	3callasm SelectMenu
+	callasm SelectMenu
-	2jump SelectMenuCallback
+	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
+	callasm TryResetFruitTrees
-	3callasm CheckFruitTree
+	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
+	writetext ObtainedFruitText
-	3callasm PickedFruitTree
+	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
+	callasm Function96f76
-	2writetext ReceivedItemText
+	writetext ReceivedItemText
 	iffalse .Full
 	waitbutton
 	specialsound

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.
@@ -108,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

macros/move_anim.asm

@@ -0,0 +1,244 @@
+anim_wait: macro
+if \1 >= $d0
+	flip out
+endc
+	db \1
+	endm
+
+anim_obj: macro
+	db $d0
+	db \1 ; obj
+	db \2 ; x
+	db \3 ; y
+	db \4 ; param
+	endm
+
+anim_1gfx: macro
+	db $d1
+	db \1 ; gfx1
+	endm
+
+anim_2gfx: macro
+	db $d2
+	db \1 ; gfx1
+	db \2 ; gfx2
+	endm
+
+anim_3gfx: macro
+	db $d3
+	db \1 ; gfx1
+	db \2 ; gfx2
+	db \3 ; gfx3
+	endm
+
+anim_4gfx: macro
+	db $d4
+	db \1 ; gfx1
+	db \2 ; gfx2
+	db \3 ; gfx3
+	db \4 ; gfx4
+	endm
+
+anim_5gfx: macro
+	db $d5
+	db \1 ; gfx1
+	db \2 ; gfx2
+	db \3 ; gfx3
+	db \4 ; gfx4
+	db \5 ; gfx5
+	endm
+
+anim_incobj: macro
+	db $d6
+	db \1 ; id
+	endm
+
+anim_setobj: macro
+	db $d7
+	db \1 ; id
+	db \2 ; obj
+	endm
+
+anim_incbgeffect: macro
+	db $d8
+	db \1 ; effect
+	endm
+
+anim_enemyfeetobj: macro
+	db $d9
+	endm
+
+anim_playerheadobj: macro
+	db $da
+	endm
+
+anim_checkpokeball: macro
+	db $db
+	endm
+
+anim_transform: macro
+	db $dc
+	endm
+
+anim_raisesub: macro
+	db $dd
+	endm
+
+anim_dropsub: macro
+	db $de
+	endm
+
+anim_resetobp0: macro
+	db $df
+	endm
+
+anim_sound: macro
+	db $e0
+	db \1 ; tracks
+	db \2 ; id
+	endm
+
+anim_cry: macro
+	db $e1
+	db \1 ; pitch
+	endm
+
+anim_minimizeopp: macro
+	db $e2
+	endm
+
+anim_oamon: macro
+	db $e3
+	endm
+
+anim_oamoff: macro
+	db $e4
+	endm
+
+anim_clearobjs: macro
+	db $e5
+	endm
+
+anim_beatup: macro
+	db $e6
+	endm
+
+anim_0xe7: macro
+	db $e7
+	endm
+
+anim_updateactorpic: macro
+	db $e8
+	endm
+
+anim_minimize: macro
+	db $e9
+	endm
+
+anim_0xea: macro
+	db $ea
+	endm
+
+anim_0xeb: macro
+	db $eb
+	endm
+
+anim_0xec: macro
+	db $ec
+	endm
+
+anim_0xed: macro
+	db $ed
+	endm
+
+anim_jumpand: macro
+	db $ee
+	db \1 ; value
+	dw \2 ; address
+	endm
+
+anim_jumpuntil: macro
+	db $ef
+	dw \1 ; address
+	endm
+
+anim_bgeffect: macro
+	db $f0
+	db \1 ; effect
+	db \2 ; unknown
+	db \3 ; unknown
+	db \4 ; unknown
+	endm
+
+anim_bgp: macro
+	db $f1
+	db \1 ; colors
+	endm
+
+anim_obp0: macro
+	db $f2
+	db \1 ; colors
+	endm
+
+anim_obp1: macro
+	db $f3
+	db \1 ; colors
+	endm
+
+anim_clearsprites: macro
+	db $f4
+	endm
+
+anim_0xf5: macro
+	db $f5
+	endm
+
+anim_0xf6: macro
+	db $f6
+	endm
+
+anim_0xf7: macro
+	db $f7
+	endm
+
+anim_jumpif: macro
+	db $f8
+	db \1 ; value
+	dw \2 ; address
+	endm
+
+anim_setvar: macro
+	db $f9
+	db \1 ; value
+	endm
+
+anim_incvar: macro
+	db $fa
+	endm
+
+anim_jumpvar: macro
+	db $fb
+	db \1 ; value
+	dw \2 ; address
+	endm
+
+anim_jump: macro
+	db $fc
+	dw \1 ; address
+	endm
+
+anim_loop: macro
+	db $fd
+	db \1 ; count
+	dw \2 ; address
+	endm
+
+anim_call: macro
+	db $fe
+	dw \1 ; address
+	endm
+
+anim_ret: macro
+	db $ff
+	endm
+

macros/movement.asm

@@ -0,0 +1,286 @@
+turn_head_down: macro
+	db $00
+	endm
+
+turn_head_up: macro
+	db $01
+	endm
+
+turn_head_left: macro
+	db $02
+	endm
+
+turn_head_right: macro
+	db $03
+	endm
+
+half_step_down: macro
+	db $04
+	endm
+
+half_step_up: macro
+	db $05
+	endm
+
+half_step_left: macro
+	db $06
+	endm
+
+half_step_right: macro
+	db $07
+	endm
+
+slow_step_down: macro
+	db $08
+	endm
+
+slow_step_up: macro
+	db $09
+	endm
+
+slow_step_left: macro
+	db $0a
+	endm
+
+slow_step_right: macro
+	db $0b
+	endm
+
+step_down: macro
+	db $0c
+	endm
+
+step_up: macro
+	db $0d
+	endm
+
+step_left: macro
+	db $0e
+	endm
+
+step_right: macro
+	db $0f
+	endm
+
+big_step_down: macro
+	db $10
+	endm
+
+big_step_up: macro
+	db $11
+	endm
+
+big_step_left: macro
+	db $12
+	endm
+
+big_step_right: macro
+	db $13
+	endm
+
+slow_slide_step_down: macro
+	db $14
+	endm
+
+slow_slide_step_up: macro
+	db $15
+	endm
+
+slow_slide_step_left: macro
+	db $16
+	endm
+
+slow_slide_step_right: macro
+	db $17
+	endm
+
+slide_step_down: macro
+	db $18
+	endm
+
+slide_step_up: macro
+	db $19
+	endm
+
+slide_step_left: macro
+	db $1a
+	endm
+
+slide_step_right: macro
+	db $1b
+	endm
+
+fast_slide_step_down: macro
+	db $1c
+	endm
+
+fast_slide_step_up: macro
+	db $1d
+	endm
+
+fast_slide_step_left: macro
+	db $1e
+	endm
+
+fast_slide_step_right: macro
+	db $1f
+	endm
+
+turn_away_down: macro
+	db $20
+	endm
+
+turn_away_up: macro
+	db $21
+	endm
+
+turn_away_left: macro
+	db $22
+	endm
+
+turn_away_right: macro
+	db $23
+	endm
+
+turn_in_down: macro
+	db $24
+	endm
+
+turn_in_up: macro
+	db $25
+	endm
+
+turn_in_left: macro
+	db $26
+	endm
+
+turn_in_right: macro
+	db $27
+	endm
+
+turn_waterfall_down: macro
+	db $28
+	endm
+
+turn_waterfall_up: macro
+	db $29
+	endm
+
+turn_waterfall_left: macro
+	db $2a
+	endm
+
+turn_waterfall_right: macro
+	db $2b
+	endm
+
+slow_jump_step_down: macro
+	db $2c
+	endm
+
+slow_jump_step_up: macro
+	db $2d
+	endm
+
+slow_jump_step_left: macro
+	db $2e
+	endm
+
+slow_jump_step_right: macro
+	db $2f
+	endm
+
+jump_step_down: macro
+	db $30
+	endm
+
+jump_step_up: macro
+	db $31
+	endm
+
+jump_step_left: macro
+	db $32
+	endm
+
+jump_step_right: macro
+	db $33
+	endm
+
+fast_jump_step_down: macro
+	db $34
+	endm
+
+fast_jump_step_up: macro
+	db $35
+	endm
+
+fast_jump_step_left: macro
+	db $36
+	endm
+
+fast_jump_step_right: macro
+	db $37
+	endm
+
+remove_fixed_facing: macro
+	db $3a
+	endm
+
+fix_facing: macro
+	db $3b
+	endm
+
+hide_person: macro
+	db $3d
+	endm
+
+show_person: macro
+	db $3e
+	endm
+
+accelerate_last: macro
+	db $45
+	endm
+
+step_sleep: macro
+	db $46
+	db \1 ; duration
+	endm
+
+step_end: macro
+	db $47
+	endm
+
+remove_person: macro
+	db $49
+	endm
+
+teleport_from: macro
+	db $4c
+	endm
+
+teleport_to: macro
+	db $4d
+	endm
+
+skyfall: macro
+	db $4e
+	endm
+
+step_wait5: macro
+	db $4f
+	endm
+
+hide_emote: macro
+	db $53
+	endm
+
+show_emote: macro
+	db $54
+	endm
+
+step_shake: macro
+	db $55
+	db \1 ; displacement
+	endm
+

macros/sound.asm

@@ -0,0 +1,198 @@
+octave: macro
+	db $d8 - (\1)
+	endm
+
+notetype: macro
+	db $d8
+	db \1 ; note_length
+	if _NARG >= 2
+	db \2 ; intensity
+	endc
+	endm
+
+forceoctave: macro
+	db $d9
+	db \1 ; octave
+	endm
+
+tempo: macro
+	db $da
+	bigdw \1 ; tempo
+	endm
+
+dutycycle: macro
+	db $db
+	db \1 ; duty_cycle
+	endm
+
+intensity: macro
+	db $dc
+	db \1 ; intensity
+	endm
+
+soundinput: macro
+	db $dd
+	db \1 ; input
+	endm
+
+unknownmusic0xde: macro
+	db $de
+	db \1 ; unknown
+	endm
+
+togglesfx: macro
+	db $df
+	endm
+
+unknownmusic0xe0: macro
+	db $e0
+	db \1 ; unknown
+	db \2 ; unknown
+	endm
+
+vibrato: macro
+	db $e1
+	db \1 ; delay
+	db \2 ; extent
+	endm
+
+unknownmusic0xe2: macro
+	db $e2
+	db \1 ; unknown
+	endm
+
+togglenoise: macro
+	db $e3
+	db \1 ; id
+	endm
+
+panning: macro
+	db $e4
+	db \1 ; tracks
+	endm
+
+volume: macro
+	db $e5
+	db \1 ; volume
+	endm
+
+tone: macro
+	db $e6
+	bigdw \1 ; tone
+	endm
+
+unknownmusic0xe7: macro
+	db $e7
+	db \1 ; unknown
+	endm
+
+unknownmusic0xe8: macro
+	db $e8
+	db \1 ; unknown
+	endm
+
+globaltempo: macro
+	db $e9
+	bigdw \1 ; value
+	endm
+
+restartchannel: macro
+	db $ea
+	dw \1 ; address
+	endm
+
+newsong: macro
+	db $eb
+	bigdw \1 ; id
+	endm
+
+sfxpriorityon: macro
+	db $ec
+	endm
+
+sfxpriorityoff: macro
+	db $ed
+	endm
+
+unknownmusic0xee: macro
+	db $ee
+	dw \1 ; address
+	endm
+
+stereopanning: macro
+	db $ef
+	db \1 ; tracks
+	endm
+
+sfxtogglenoise: macro
+	db $f0
+	db \1 ; id
+	endm
+
+music0xf1: macro
+	db $f1
+	endm
+
+music0xf2: macro
+	db $f2
+	endm
+
+music0xf3: macro
+	db $f3
+	endm
+
+music0xf4: macro
+	db $f4
+	endm
+
+music0xf5: macro
+	db $f5
+	endm
+
+music0xf6: macro
+	db $f6
+	endm
+
+music0xf7: macro
+	db $f7
+	endm
+
+music0xf8: macro
+	db $f8
+	endm
+
+unknownmusic0xf9: macro
+	db $f9
+	endm
+
+setcondition: macro
+	db $fa
+	db \1 ; condition
+	endm
+
+jumpif: macro
+	db $fb
+	db \1 ; condition
+	dw \2 ; address
+	endm
+
+jumpchannel: macro
+	db $fc
+	dw \1 ; address
+	endm
+
+loopchannel: macro
+	db $fd
+	db \1 ; count
+	dw \2 ; address
+	endm
+
+callchannel: macro
+	db $fe
+	dw \1 ; address
+	endm
+
+endchannel: macro
+	db $ff
+	endm
+

macros/text.asm

@@ -0,0 +1,65 @@
+text_from_ram: macro
+	db 1
+	dw \1
+	endm
+
+text_dunno1: macro
+	db 5
+	endm
+
+text_waitbutton: macro
+	db 6
+	endm
+
+text_dunno2: macro
+	db 7
+	endm
+
+start_asm: macro
+	db 8
+	endm
+
+deciram: macro
+	db 9
+	dw \1
+	db \2
+	endm
+
+interpret_data: macro
+	db 10
+	endm
+
+sound0: macro
+	db 11
+	endm
+
+limited_interpret_data: macro
+	db 12
+	db \1
+	endm
+
+sound0x0F: macro
+	db $f
+	endm
+
+sound0x02: macro
+	db $10
+	endm
+
+sound0x0A: macro
+	db $11
+	endm
+
+sound0x2C: macro
+	db $13
+	endm
+
+current_day: macro
+	db $15
+	endm
+
+text_jump: macro
+	db $16
+	dw \1
+	db BANK(\1)
+	endm

maps/AzaleaGym.asm

@@ -11,7 +11,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
 	loadfont
 	checkevent EVENT_BEAT_BUGSY
 	iftrue UnknownScript_0x18ec48
-	2writetext UnknownText_0x18ed0b
+	writetext UnknownText_0x18ed0b
 	closetext
 	loadmovesprites
 	winlosstext UnknownText_0x18edae, $0000
@@ -20,12 +20,12 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
 	returnafterbattle
 	setevent EVENT_BEAT_BUGSY
 	loadfont
-	2writetext UnknownText_0x18ee14
+	writetext UnknownText_0x18ee14
 	playsound SFX_GET_BADGE
 	waitbutton
 	setflag $001c
 	checkcode $7
-	2call UnknownScript_0x18ec73
+	scall UnknownScript_0x18ec73
 UnknownScript_0x18ec48: ; 0x18ec48
 	checkevent EVENT_GOT_TM49_FURY_CUTTER
 	iftrue UnknownScript_0x18ec6d
@@ -33,19 +33,19 @@ UnknownScript_0x18ec48: ; 0x18ec48
 	setevent EVENT_BEAT_BUG_CATCHER_BENNY
 	setevent EVENT_BEAT_BUG_CATCHER_AL
 	setevent EVENT_BEAT_BUG_CATCHER_JOSH
-	2writetext UnknownText_0x18ee2b
+	writetext UnknownText_0x18ee2b
 	keeptextopen
 	verbosegiveitem TM_49, 1
 	iffalse UnknownScript_0x18ec71
 	setevent EVENT_GOT_TM49_FURY_CUTTER
-	2writetext UnknownText_0x18eefa
+	writetext UnknownText_0x18eefa
 	closetext
 	loadmovesprites
 	end
 ; 0x18ec6d
 
 UnknownScript_0x18ec6d: ; 0x18ec6d
-	2writetext UnknownText_0x18ef98
+	writetext UnknownText_0x18ef98
 	closetext
 UnknownScript_0x18ec71: ; 0x18ec71
 	loadmovesprites
@@ -89,7 +89,7 @@ TrainerTwinsAmyandmay1: ; 0x18ec82
 TwinsAmyandmay1Script: ; 0x18ec8e
 	talkaftercancel
 	loadfont
-	2writetext UnknownText_0x18f1fc
+	writetext UnknownText_0x18f1fc
 	closetext
 	loadmovesprites
 	end
@@ -118,7 +118,7 @@ TrainerTwinsAmyandmay2: ; 0x18ec96
 TwinsAmyandmay2Script: ; 0x18eca2
 	talkaftercancel
 	loadfont
-	2writetext UnknownText_0x18f269
+	writetext UnknownText_0x18f269
 	closetext
 	loadmovesprites
 	end
@@ -147,7 +147,7 @@ TrainerBug_catcherBug_catcher_benny: ; 0x18ecaa
 Bug_catcherBug_catcher_bennyScript: ; 0x18ecb6
 	talkaftercancel
 	loadfont
-	2writetext UnknownText_0x18f053
+	writetext UnknownText_0x18f053
 	closetext
 	loadmovesprites
 	end
@@ -176,7 +176,7 @@ TrainerBug_catcherAl: ; 0x18ecbe
 Bug_catcherAlScript: ; 0x18ecca
 	talkaftercancel
 	loadfont
-	2writetext UnknownText_0x18f0d3
+	writetext UnknownText_0x18f0d3
 	closetext
 	loadmovesprites
 	end
@@ -205,7 +205,7 @@ TrainerBug_catcherJosh: ; 0x18ecd2
 Bug_catcherJoshScript: ; 0x18ecde
 	talkaftercancel
 	loadfont
-	2writetext UnknownText_0x18f17e
+	writetext UnknownText_0x18f17e
 	closetext
 	loadmovesprites
 	end
@@ -216,14 +216,14 @@ AzaleaGymGuyScript: ; 0x18ece6
 	checkevent EVENT_BEAT_BUGSY
 	iftrue .AzaleaGymGuyWinScript
 	loadfont
-	2writetext AzaleaGymGuyText
+	writetext AzaleaGymGuyText
 	closetext
 	loadmovesprites
 	end
 
 .AzaleaGymGuyWinScript
 	loadfont
-	2writetext AzaleaGymGuyWinText
+	writetext AzaleaGymGuyWinText
 	closetext
 	loadmovesprites
 	end