Merge branch 'progress' into english2

# Conflicts: # .github/ok/ok.py # .github/ok/webhook.py
ZoomTen · Oct 6, 2021 · a80e5b0 · a80e5b0
2 parents c34ee69 + 89e9893
commit a80e5b0
Show file tree

Hide file tree

Showing 10 changed files with 1,324 additions and 116 deletions.
diff --git a/banks/bank_07.asm b/banks/bank_07.asm
@@ -963,7 +963,7 @@ unk_007_4ed2:
 
 unk_007_4edf:
 	warp_event ABSOLUTE,  8, $2d, $0a, $00
-	event_04  4,  3,  0, unk_00e_4651
+	event_04  4,  3,  0, unk_00e_4652
 	events_end
 
 unk_007_4eec:

diff --git a/banks/bank_0b.asm b/banks/bank_0b.asm
@@ -84,7 +84,7 @@ ScriptCommandTable:
 	dw Script_spriteface       ; $01
 	dw Script_delay    ; $02
 	dw Script_03       ; $03
-	dw Script_04       ; $04
+	dw Script_04       ; $04 another textbox command?
 	dw Script_face     ; $05
 	dw Script_spritewalk       ; $06
 	dw Script_07       ; $07
@@ -102,7 +102,7 @@ ScriptCommandTable:
 	dw Script_13       ; $13
 	dw Script_text     ; $14
 	dw Script_emote    ; $15
-	dw Script_16       ; $16
+	dw Script_16       ; $16 load sprite definitions?
 	dw Script_17       ; $17
 	dw Script_18       ; $18
 	dw Script_19       ; $19
@@ -139,7 +139,7 @@ ScriptCommandTable:
 	dw Script_38       ; $38
 	dw Script_39       ; $39
 	dw Script_3a       ; $3a
-	dw Script_3b       ; $3b
+	dw Script_3b       ; $3b start a battle?
 	dw Script_3c       ; $3c
 	dw Script_3d       ; $3d
 	dw Script_3e       ; $3e
@@ -183,7 +183,7 @@ ScriptCommandTable:
 	dw Script_64       ; $64
 	dw Script_65       ; $65
 	dw Script_66       ; $66
-	dw Script_67       ; $67
+	dw Script_67       ; $67 follower related?
 	dw Script_68       ; $68
 	dw Script_69       ; $69
 	dw Script_6a       ; $6a

diff --git a/banks/bank_0e.asm b/banks/bank_0e.asm
@@ -613,7 +613,7 @@ Script_00e_464e:
 	scr_text text_0e_5b91
 	scr_end
 
-unk_00e_4651:
+unk_00e_4652:
 	scr_face $02 ; TEMP
 	scr_spriteface $02, $03 ; TEMP
 	scr_text text_0e_5b91