summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-11-03 20:07:25 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-11-03 20:07:25 -0500
commit0c7b309f7f275f7cfee99bddea8b645c4c8f5f7f (patch)
treebae41a47e13d2cc0ce22ea2b2eeb573138242caf
parent2239593f3c4a93a2fa7030d715c95ef56f5351f5 (diff)
Suggested formatting changes
-rw-r--r--engine/events/diploma.asm2
-rw-r--r--engine/overworld/scripting.asm2
-rw-r--r--engine/pokedex/pokedex_3.asm2
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm
index aa4755e4f..099598f81 100644
--- a/engine/events/diploma.asm
+++ b/engine/events/diploma.asm
@@ -86,3 +86,5 @@ INCBIN "gfx/diploma/page1.tilemap"
DiplomaPage2Tilemap:
INCBIN "gfx/diploma/page2.tilemap"
+
+ ret ; unused
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 7f82ea81d..415d29d6d 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -148,7 +148,7 @@ ScriptCommandTable:
dw Script_farjumptext ; 52
dw Script_jumptext ; 53
dw Script_waitbutton ; 54
- dw Script_promptbutton ; 55
+ dw Script_promptbutton ; 55
dw Script_pokepic ; 56
dw Script_closepokepic ; 57
dw Script__2dmenu ; 58
diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm
index feb4b18d5..d7829dd4b 100644
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -1,5 +1,3 @@
- ret ; unused
-
LoadSGBPokedexGFX:
ld hl, SGBPokedexGFX_LZ
ld de, vTiles2 tile $31