Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: Normmatt/Bomberman-Jetters-GBA-Translation
base: 3915f33529
...
head fork: Normmatt/Bomberman-Jetters-GBA-Translation
compare: 4d2aa086b1
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
53 asm/SmallVWF.asm
View
@@ -62,10 +62,10 @@ here:
.pool
.endarea
-.org 0x081D5CAA
- .halfword 0x0233 ;.halfword 0x0232
+;.org 0x081D5CAA
+; .halfword 0x0233 ;.halfword 0x0232
-.org 0x8453560 ; should be free space to put code
+.org 0x08453560 ; should be free space to put code
loadCharacter:
ldr r5, [jumpAdr]
bx r5
@@ -103,6 +103,9 @@ putChar:
ldr r2, =WidthTable
ldrb r2, [r2,r6]
+ bl GetNextTileAddress
+ mov r3, r0
+
ldr r6, [overflow]
ldrb r1, [r6]
mov r5, r1 ; r5 = current overflow
@@ -112,8 +115,7 @@ putChar:
mov r2, #8
sub r1, r1, r2
; clear next tile
- BL GetNextTile
- bl GetNextTileAddress
+ mov r0, r3
ldr r2, [mask]
mul r2, r7 ; times 0x11111111 by the bg color pallete index
@@ -131,7 +133,7 @@ putChar:
LDR R0, [R2,#0x40]
ADD R0, #1 ; increment map address
STR R0, [R2,#0x40]
- LDR R0, [R2,#0x44]
+ ;LDR R0, [R2,#0x44]
BL GetNextTile
STR R0, [R2,#0x44]
@@ -142,20 +144,10 @@ NoNewTile:
mov r6, #0x20 ; i feel like this code should be somewhere else
sub r6, r6, r5 ; r6 is to shift the existing background
- mov r3, r4
-
- bl GetNextTileAddress
- mov r4, r0
- ;add r4, #0x20
-
- ;LDR r0, =0x3007470
- ;LDR R1, [R0,#0x44]
- ;ADD R2, R1, #1
- ;LSL R2, R2, #5
- ;LSL R1, R1, #5
- ;LDR R0, [R0,#0x70]
- ;ADD R3, R0, R1
- ;ADD R4, R0, R2
+ ;have to register shuffle here because dont have any other free registers
+ mov r2, r4
+ mov r4, r3
+ mov r3, r2
mov r0, sp
;r0 = font, r3 = VRAM, r4 = overflow tile, r5 will be shift
@@ -226,14 +218,25 @@ GetNextTile_skip:
bx lr
GetNextTileAddress:
- push {r1,lr}
+ push {r1-r3}
+ LDR R2, =0x3007470
+ LDR R0, [R2,#0x44]
+ ADD R0, #1 ; increment tile address
- ;bl GetNextTile
- LDR R1, =0x3007470
+ ;Handle case where tile address wraps around
+ LDR R1, [R2,#0x78]
+ LDRH R3, [R1,#0xE] ; 0x0233
+ CMP R0, R3
+ BLS GetNextTileAddress_skip
+
+ LDRH R0, [R1,#0xC]
+
+GetNextTileAddress_skip:
LSL R0, R0, #5
- LDR R1, [R1,#0x70]
+ LDR R1, [R2,#0x70]
ADD R0, R0, R1
- pop {r1,pc}
+ pop {r1-r3}
+ bx lr
ResetOverflow:
; reset overflow
2  asm/bin/smallWidthTable.bin
View
@@ -1 +1 @@
-
+
20 script/bomberman_script_000.txt
View
@@ -121,7 +121,7 @@ before it's too late!<WAIT>
//POINTER #13 @ $1BDAC4 - STRING #13 @ $1BD98A
#WRITE(GBA,$1BDAC4)
-������o?[�f�B?[ ������o?[�f�B?[<WAIT>
+������o[�f�B[ ������o[�f�B[<WAIT>
//POINTER #14 @ $1BDAC8 - STRING #14 @ $1BD99C
@@ -133,13 +133,13 @@ before it's too late!<WAIT>
#WRITE(GBA,$1BDACC)
���ꂢ�炢 �}�C�e�B����� ���炭��<LINE>
-�Ƃ����� �܂܂�?d?d?d?d<WAIT>
+�Ƃ����� �܂܂��d�d�d�d<WAIT>
//POINTER #16 @ $1BDAD0 - STRING #16 @ $1BD9D9
#WRITE(GBA,$1BDAD0)
�q�Q�q�Q���� �����ꂽ!<LINE>
-�W�F�b�^?[�Y ����‚ǂ�����!!<WAIT>
+�W�F�b�^[�Y ����‚ǂ�����!!<WAIT>
//POINTER #17 @ $1BDAD4 - STRING #17 @ $1BD9F9
@@ -149,23 +149,23 @@ before it's too late!<WAIT>
//POINTER #18 @ $1BDAD8 - STRING #18 @ $1BDA05
#WRITE(GBA,$1BDAD8)
-�ł񂹂‚� �{���o?[�}���� ��΂ꂽ<LINE>
-�}�C�e�B�� �����‚��邩��? �V�?�{��<WAIT>
+�ł񂹂‚� �{���o[�}���� ��΂ꂽ<LINE>
+�}�C�e�B�� �����‚��邩��? �V��{��<WAIT>
//POINTER #19 @ $1BDADC - STRING #19 @ $1BDA2C
#WRITE(GBA,$1BDADC)
-�t�t�t?d?d ����� �{���o?[�}���� �f?[�^��<LINE>
-���ׂ� �R�s?[�ł���?d?d?d?d<WAIT>
+�t�t�t�d�d ����� �{���o[�}���� �f[�^��<LINE>
+���ׂ� �R�s[�ł����d�d�d�d<WAIT>
//POINTER #20 @ $1BDAE0 - STRING #20 @ $1BDA52
#WRITE(GBA,$1BDAE0)
���悢�� �������傤�� ����<LINE>
-�}�b�N�X�� ���񂶂傤����?d?d<WAIT>
+�}�b�N�X�� ���񂶂傤����d�d<WAIT>
//POINTER #21 @ $1BDAE4 - STRING #21 @ $1BDA72
#WRITE(GBA,$1BDAE4)
-�t�b�t�b�t�b?d?d?d?d<LINE>
-�n?[�b�n�b�n�b�n�b�n�b�n�b?d?d?d?d<WAIT>
+�t�b�t�b�t�b�d�d�d�d<LINE>
+�n[�b�n�b�n�b�n�b�n�b�n�b�d�d�d�d<WAIT>
150 script/bomberman_script_002.txt
View
@@ -19,27 +19,31 @@
//BLOCK #002 NAME: Block 3 (POINTER)
//POINTER #0 @ $1C1B3C - STRING #0 @ $1BDE7C
-
+#ACTIVETBL(engTable)
#WRITE(GBA,$1C1B3C)
-<CONTROL_CODE><$01><$02>23�ӂ�! �W�F�b�^�[�Y�� ���ɂ������!<LINE>
-�͂��� ���������� ���Ă��ꂽ��ł���?<NEWBOX>
-�Ȃ�ɂ��� �܂���<LINE>
-�������� ���Ђт��������Ƃ�������<NEWBOX>
-���̃V���b�N�� �Ђ����A�N�A��<LINE>
-�ނ����͂��� ������������<END>
+<CONTROL_CODE_E001><$02><$03><$04><$26>Hey, it's Brother Jetters!<LINE>
+Did you come because<LINE>
+of the collapsing bridge?<NEWBOX>
+I wonder how many days<LINE>
+ago the tremor hit.<NEWBOX>
+That "shock" is what<LINE>
+caused the Bridge to East<NEWBOX>
+Aqua to collapse.<END>
//POINTER #1 @ $1C1B40 - STRING #1 @ $1BDEE8
#WRITE(GBA,$1C1B40)
-<CONTROL_CODE><$01><$02>23�Ђ͂��������������� ���Ă����Ȃ��<LINE>
-�W�F�b�^�[�Y�� ��������q�}�Ȃ񂾂�<NEWBOX>
-�ł� �͂��� ���̂ނ�̂�������<LINE>
-������ �Ȃ����Ă�����<NEWBOX>
-������ ����������� �ЂƂ�����<LINE>
-���ł� �����񂾂�<NEWBOX>
-�E�`�� �Ђ���̂�����<LINE>
-�ӂ��ӂ� ����ł����<END>
-
+<CONTROL_CODE_E001><$02><$03><$04><$25>You came because of the bridge,<LINE>
+didn't you?<NEWBOX>
+You Jetters sure have a lot of<LINE>
+free time, huh?<NEWBOX>
+Anyway, the village Carpenter will<LINE>
+fix the bridge as soon as he can.<NEWBOX>
+He can be a little careless<LINE>
+sometimes, but he's strong.<NEWBOX>
+A married couple lives in<LINE>
+the house next to me.<END>
+#ACTIVETBL(Table)
//POINTER #2 @ $1C1B44 - STRING #2 @ $1BDF67
#WRITE(GBA,$1C1B44)
@@ -90,21 +94,23 @@
����‚��� �����񂾂�<END>
//POINTER #7 @ $1C1B58 - STRING #7 @ $1BE14D
-
+#ACTIVETBL(engTable)
#WRITE(GBA,$1C1B58)
-<CONTROL_CODE><$01><$02>33��<CONTROL_CODE><$01><$02> 3�ʃE�`�̃_���i �������Ȃ񂾂��ǂ�<LINE>
-���炭 ������������� ���܂��<NEWBOX>
-�͂���Ȃ������߂� �����̂���<LINE>
-�������� ����ɂ�����񂾂���<NEWBOX>
-������� <CONTROL_CODE><$1A><$2B>�����<LINE>
-�łĂ���Ă��܂���̂�<NEWBOX>
-�A�i�^ ���ɂ���_���i��<LINE>
-���̃I�m�� �Ƃǂ��Ă��傤������<NEWBOX>
-<CONTROL_CODE><$03><$02> �{���o�[�}���� <CONTROL_CODE><$1A><$2A>��<LINE>
-�Ăɂ��ꂽ!<CONTROL_CODE><$12><$0C><CONTROL_CODE><$03><$01>��<NEWBOX>
-�����̂��ɂ� �ӂ���‚��� �L�m�R�������<LINE>
-���ԂȂ����� ����‚��Ă��傤������<END>
-
+<CONTROL_CODE_E001><$02><$04><$04><$22><CONTROL_CODE_E001><$02><$00><$04><$21>My husband is a carpenter.<LINE>
+He can be so careless sometimes.<NEWBOX>
+He went to the forest to cut lumber,<LINE>
+so that he could can fix the bridge.<NEWBOX>
+He brought the <GET_ITEM_NAME><$2B> by<LINE>
+mistake.<NEWBOX>
+Please deliver this Axe to my<LINE>
+husband in the forest.<NEWBOX>
+Bomberman recieved the<CONTROL_CODE_E003><$02><$00><LINE>
+<GET_ITEM_NAME><$2A>!<CONTROL_CODE><$12><$0C><CONTROL_CODE_E003><$01><$20><NEWBOX>
+There are Rejuvinating Mushrooms<LINE>
+in the North Forest.<NEWBOX>
+It's dangerous!<LINE>
+so please be careful alright?<END>
+#ACTIVETBL(Table)
//POINTER #8 @ $1C1B5C - STRING #8 @ $1BE21E
#WRITE(GBA,$1C1B5C)
@@ -135,33 +141,33 @@
�͂��� ���肮����<END>
//POINTER #11 @ $1C1B68 - STRING #11 @ $1BE2FB
-
+#ACTIVETBL(engTable)
#WRITE(GBA,$1C1B68)
-�悤���� ������ �ɂ��A�N�A�d�d<LINE>
-��! �W�F�b�^�[�Y��!<NEWBOX>
-���ɂ������ �W�F�b�^�[�Y�� �ЂƂł���!<LINE>
-����������Ȃ��d�d<NEWBOX>
-�W�F�b�^�[�Y�� ������Ă��Ƃ�<LINE>
-�Ȃɂ� ������ ������̂��Ȃ��d�d<END>
+Welcome to West Aqua...<LINE>
+Ah! It's a member of Jetters!<NEWBOX>
+Brother Jetters!<LINE>
+You're so cool...<NEWBOX>
+Did you guys come because<LINE>
+something happened?<END>
//POINTER #12 @ $1C1B6C - STRING #12 @ $1BE35B
#WRITE(GBA,$1C1B6C)
-����ƂЂ����� �t�H���X�^�E���ɂ�<LINE>
-�~�h���͂��� �Ƃ����ЂƂ� ���Ă�<NEWBOX>
-���̂ق��� ��������������<LINE>
-���񂫂イ�� ���Ă�񂶂�<NEWBOX>
-���� �~�h���͂����� �܂�<LINE>
-�L���C�ȂЂƂłȁd�d �t�F�t�F<END>
+A person called Professor Green,<LINE>
+has lived in Forest Town for years.<NEWBOX>
+He researches the Star's<LINE>
+Ancient Ruins.<NEWBOX>
+This Professor Green,<LINE>
+is a clean person again... hehe.<END>
//POINTER #13 @ $1C1B70 - STRING #13 @ $1BE3B9
#WRITE(GBA,$1C1B70)
-�Ђ����ւނ��� �䂢���‚�<LINE>
-�͂��� �����Ă��܂��Ƃ́d�d<NEWBOX>
-������� ���� ���Ђт���<LINE>
-�Ȃɂ� ���񂢂񂾂���̂��d�d<END>
-
+The only bridge to the east,<LINE>
+has fallen...<NEWBOX>
+What on Earth was that tremor?<LINE>
+I wonder what would've caused it...<END>
+#ACTIVETBL(Table)
//POINTER #14 @ $1C1B74 - STRING #14 @ $1BE3F4
#WRITE(GBA,$1C1B74)
@@ -235,30 +241,33 @@
����ς� ���Ă����񂾂Ƃ��d�d<END>
//POINTER #23 @ $1C1B98 - STRING #23 @ $1BE64A
-
+#ACTIVETBL(engTable)
#WRITE(GBA,$1C1B98)
-��~ ������ ���Ă����̂� �܂�������<LINE>
-<CONTROL_CODE><$1A><$2B>�� ���Ă����܂��<NEWBOX>
-���̃I�m���� ����Ƃ� ��������˂���<LINE>
-������ <CONTROL_CODE><$1A><$2A>�� ����񂾂�<NEWBOX>
-�Ƃ�ɂ�����̂� �߂�ǂ����Ȃ�<CONTROL_CODE><$01><$02> 3��<END>
+I came to cut the trees, but I made<LINE>
+a big mistake.<NEWBOX>
+See, I brought my <GET_ITEM_NAME><$2B><LINE>
+which has trouble cutting trees.<NEWBOX>
+The <GET_ITEM_NAME><$2A> is at my house.<LINE>
+I've had trouble returning there<NEWBOX>
+by bird.<CONTROL_CODE_E001><$02><$00><$04><$18><END>
+
//POINTER #24 @ $1C1B9C - STRING #24 @ $1BE6A9
#WRITE(GBA,$1C1B9C)
<NEWBOX>
-��! ����� �I�C���� �I�m����˂���<LINE>
-�Ƃǂ��Ă��ꂽ�̂� ���肪�Ƃ�<NEWBOX>
-��~�� ���ꂳ������� ���������<LINE>
-�͂��Ȃ�� �A�b�Ƃ����܂� �Ȃ����Ă�邺<NEWBOX>
-���� <CONTROL_CODE><$1A><$2B>��<LINE>
-����Ȃ����� ���܂������ ����<NEWBOX>
-�{���o�[�}����<LINE>
-<CONTROL_CODE><$1A><$2B>�� �Ăɂ��ꂽ!<CONTROL_CODE><$12><$0C><CONTROL_CODE><$04><$01>��<CONTROL_CODE><$03><$01>��<NEWBOX>
-�I�C���� ���������<LINE>
-�܂� �܂������� ���Ă����܂������<NEWBOX>
-�����[! ���邼�[!<END>
-
+Ah, this is my Axe, isn't it!?<LINE>
+Thank you for returning it.<NEWBOX>
+Alright! now that I can cut the trees.<LINE>
+I'll fix the bridge in no time.<NEWBOX>
+I don't need this <GET_ITEM_NAME><$2B>,<LINE>
+so I'll give it to you.<NEWBOX>
+Bomberman received the<LINE>
+<GET_ITEM_NAME><$2B>!<CONTROL_CODE><$12><$0C><CONTROL_CODE_E004><$01><$20><CONTROL_CODE_E003><$01><$21><NEWBOX>
+If we bring this, we won't<LINE>
+run into another mistake.<NEWBOX>
+OK! I'll cut it!<END>
+#ACTIVETBL(Table)
//POINTER #25 @ $1C1BA0 - STRING #25 @ $1BE75C
#WRITE(GBA,$1C1BA0)
@@ -1103,7 +1112,7 @@ B
//POINTER #107 @ $1C1CE8 - STRING #107 @ $1C07CA
#WRITE(GBA,$1C1CE8)
-�{���o�[�}���� <CONTROL_CODE><$1A><$FF>��<LINE>
+�{���o�[�}���� <GET_ITEM_NAME><$FF>��<LINE>
�Ăɂ��ꂽ!<CONTROL_CODE><$12><$0C><END>
//POINTER #108 @ $1C1CEC - STRING #108 @ $1C07E1
@@ -1422,7 +1431,7 @@ B
//POINTER #153 @ $1C1DA0 - STRING #153 @ $1C0F6E
#WRITE(GBA,$1C1DA0)
-<CONTROL_CODE><$12><$0C><CONTROL_CODE><$1A><$FF>�� ���������ł���!<$F8><CONTROL_CODE><$12><$0C><CONTROL_CODE><$1A><$FF>�� ���������ł���!<NEWBOX>
+<CONTROL_CODE><$12><$0C><GET_ITEM_NAME><$FF>�� ���������ł���!<$F8><CONTROL_CODE><$12><$0C><GET_ITEM_NAME><$FF>�� ���������ł���!<NEWBOX>
����͂� ���Ă���悤����<LINE>
30�S�[���h�� �����Ƃ�Ă����悤<$F8>�‚Â��� �������� ���܂���?<LINE>
�͂� ������<CONTROL_CODE><$17><$03>1��13�_3�a<CONTROL_CODE><$13><$01><WAIT>
@@ -1430,7 +1439,7 @@ B
//POINTER #154 @ $1C1DA4 - STRING #154 @ $1C0F7F
#WRITE(GBA,$1C1DA4)
-<CONTROL_CODE><$12><$0C><CONTROL_CODE><$1A><$FF>�� ���������ł���!<NEWBOX>
+<CONTROL_CODE><$12><$0C><GET_ITEM_NAME><$FF>�� ���������ł���!<NEWBOX>
����͂� ���Ă���悤����<LINE>
30�S�[���h�� �����Ƃ�Ă����悤<$F8>�‚Â��� �������� ���܂���?<LINE>
�͂� ������<CONTROL_CODE><$17><$03>1��13�_3�a<CONTROL_CODE><$13><$01><WAIT>
@@ -1455,7 +1464,8 @@ B
#WRITE(GBA,$1C1DB4)
���̂��݂��킹��<LINE>
-<CONTROL_CODE><$1A><$FF>�� �ł��܂�<NEWBOX>
+<GET_ITEM_NAME><$FF>�� �ł��܂�<NEWBOX>
+<GET_ITEM_NAME><$FF>�� �ł��܂�<NEWBOX>
�������� ���܂���?<LINE>
�͂� ������<CONTROL_CODE><$17><$03>1��13��3�ς���� ���������ł��܂���<$F8>��~ ���� �‚����~��~<LINE>
������� ���傤�ق��� ���‚߂�~��~<NEWBOX>

No commit comments for this range

Something went wrong with that request. Please try again.