diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-07-17 23:08:04 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-07-18 10:55:30 +0200 |
| commit | 1fc7430a2baa2835f4dad4676a3e7ae513275a7d (patch) | |
| tree | 9ea4f88527995b7b7790e988fc4c495d0e7dbe85 /mobile | |
| parent | 778d57ba217e9f0da9af03beceab0cc5fbd153b5 (diff) | |
Fix misnamed character codes
Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.
I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_22.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index da8fee07c..5f0f3e86e 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -3894,7 +3894,7 @@ Function8aab6: ret String_8aaf0: - db "あたらしい めいし<PKMN>できまし<LNBRK>@" + db "あたらしい めいし<PKMN>できまし<LF>@" Function8ab00: ld de, String_8911c diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 505d6cdbd..6e47e4b6c 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -3570,25 +3570,25 @@ Palette_17eff6: RGB 24, 16, 3 RGB 0, 0, 0 -Function17f036:: +RunMobileScript:: ld a, $6 call GetSRAMBank inc de -.asm_17f03c - call Function17f047 - jr c, .asm_17f043 - jr .asm_17f03c +.loop + call _RunMobileScript + jr c, .finished + jr .loop -.asm_17f043 +.finished call CloseSRAM ret -Function17f047: +_RunMobileScript: ld a, [de] inc de cp $50 jr z, .finished - cp $10 + cp $10 ; jumptable size jr nc, .finished dec a push de |