summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xengine/pinball_game/ball_saver/ball_saver_catchem_mode.asm8
-rwxr-xr-xengine/pinball_game/evolution_mode/evolution_mode_blue_field.asm6
-rwxr-xr-xengine/pinball_game/evolution_mode/evolution_mode_red_field.asm2
-rw-r--r--engine/pinball_game/object_collision/.gitignore1
-rwxr-xr-xengine/pinball_game/object_collision/red_stage_resolve_collision.asm56
-rw-r--r--gfx/stage/apostrophe_color.png (renamed from gfx/unknown/d63d0.png)bin74 -> 74 bytes
-rw-r--r--gfx/stage/apostrophe_mono.png (renamed from gfx/unknown/d61d0.png)bin74 -> 74 bytes
-rw-r--r--gfx/stage/colon_color.png (renamed from gfx/unknown/d63e0.png)bin73 -> 73 bytes
-rw-r--r--gfx/stage/colon_mono.png (renamed from gfx/unknown/d61e0.png)bin73 -> 73 bytes
-rw-r--r--gfx/stage/exclamation_point_color.png (renamed from gfx/unknown/d63a0.png)bin73 -> 73 bytes
-rw-r--r--gfx/stage/exclamation_point_mono.png (renamed from gfx/unknown/d61a0.png)bin74 -> 74 bytes
-rw-r--r--gfx/stage/period_color.png (renamed from gfx/unknown/d63b0.png)bin71 -> 71 bytes
-rw-r--r--gfx/stage/period_mono.png (renamed from gfx/unknown/d61b0.png)bin71 -> 71 bytes
-rwxr-xr-xhome/text.asm122
-rwxr-xr-xmain.asm64
-rwxr-xr-xwram.asm4
16 files changed, 140 insertions, 123 deletions
diff --git a/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm b/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm
index ac6c163..2d1dbdd 100755
--- a/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm
+++ b/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm
@@ -4,7 +4,7 @@ InitBallSaverForCatchEmMode: ; 0xdbd4
ld a, [wBallSaverTimerSeconds]
ld [wBallSaverTimerSecondsBackup], a
ld a, [wNumTimesBallSavedTextWillDisplay]
- ld [wd4a8], a
+ ld [wNumTimesBallSavedTextWillDisplayBackup], a
ld a, $0
ld [wBallSaverIconOn], a
ld a, $ff
@@ -22,13 +22,13 @@ RestoreBallSaverAfterCatchEmMode: ; 0xdc00
ld [wBallSaverTimerFrames], a
ld a, [wBallSaverTimerSecondsBackup]
ld [wBallSaverTimerSeconds], a
- ld a, [wd4a8]
+ ld a, [wNumTimesBallSavedTextWillDisplayBackup]
ld [wNumTimesBallSavedTextWillDisplay], a
ld a, [wBallSaverTimerSeconds]
and a
- jr z, .asm_dc1a
+ jr z, .SetSaverIconOff
ld a, $1
-.asm_dc1a
+.SetSaverIconOff
ld [wBallSaverIconOn], a
ld a, [wBallSaverTimerSeconds]
ld c, $0
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
index a9b0b00..abf1ca8 100755
--- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
@@ -174,7 +174,7 @@ Func_20c76: ; 0x20c76
Func_20d30: ; 0x20d30
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ca5
+ callba PlaceEvolutionInParty
callba Func_10ac8
ld de, $0001
call PlaySong
@@ -186,9 +186,9 @@ Func_20d30: ; 0x20d30
ret z
add $2
cp $3
- jr c, .asm_20d72
+ jr c, .DontClampBalls
ld a, $3
-.asm_20d72
+.DontClampBalls
ld [wNumPokeballs], a
ld a, $80
ld [wPokeballBlinkingCounter], a
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
index ca7faaf..3b42550 100755
--- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
@@ -177,7 +177,7 @@ Func_20651: ; 0x20651
Func_2070b: ; 0x2070b
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ca5
+ callba PlaceEvolutionInParty
callba Func_10ac8
ld de, $0001
call PlaySong
diff --git a/engine/pinball_game/object_collision/.gitignore b/engine/pinball_game/object_collision/.gitignore
new file mode 100644
index 0000000..2d96ba3
--- /dev/null
+++ b/engine/pinball_game/object_collision/.gitignore
@@ -0,0 +1 @@
+*.kate-swp
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
index b60060b..531c7c5 100755
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -54,10 +54,10 @@ Func_146a2: ; 0x146a2
Func_146a9: ; 0x146a9
ld a, [wBallSaverTimerFrames]
ld hl, wBallSaverTimerSeconds
- or [hl]
+ or [hl] ;if both the number of frames and number of seconds left is 0, skip
ret z
ld a, [wBallXPos + 1]
- cp $9a
+ cp 154 ;if high? Byte of ball X pos is >= 154, jump ahead
jr nc, .asm_146e8
ld a, [wBallSaverTimerFrames]
dec a
@@ -2429,7 +2429,7 @@ TileDataPointers_15325:
TileData_1532d: ; 0x1532d
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $121
db $27
@@ -2438,7 +2438,7 @@ TileData_1532d: ; 0x1532d
TileData_15333: ; 0x15333
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $123
db $29
@@ -2447,7 +2447,7 @@ TileData_15333: ; 0x15333
TileData_15339: ; 0x15339
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $130
db $7E
@@ -2456,7 +2456,7 @@ TileData_15339: ; 0x15339
TileData_1533f: ; 0x1533f
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $132
db $7F
@@ -2465,7 +2465,7 @@ TileData_1533f: ; 0x1533f
TileData_15345: ; 0x15345
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $121
db $26
@@ -2474,7 +2474,7 @@ TileData_15345: ; 0x15345
TileData_1534b: ; 0x1534b
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $123
db $28
@@ -2483,7 +2483,7 @@ TileData_1534b: ; 0x1534b
TileData_15351: ; 0x15351
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $130
db $7C
@@ -2492,7 +2492,7 @@ TileData_15351: ; 0x15351
TileData_15357: ; 0x15357
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $132
db $7D
@@ -4392,7 +4392,7 @@ TileData_15e21: ; 0x15e21
TileData_15e50: ; 0x15e50
dw LoadTileLists
db $09 ; total number of tiles
-
+
db $03 ; number of tiles
dw vBGMap + $100
db $45, $46, $22
@@ -4414,7 +4414,7 @@ TileData_15e50: ; 0x15e50
TileData_15e69: ; 0x15e69
dw LoadTileLists
db $09 ; total number of tiles
-
+
db $03 ; number of tiles
dw vBGMap + $100
db $43, $44, $22
@@ -6726,7 +6726,7 @@ TileData_16c46: ; 0x16c46
TileData_16c49: ; 0x16c49
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $5E
@@ -6752,7 +6752,7 @@ TileData_16c49: ; 0x16c49
TileData_16c63: ; 0x16c63
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $65
@@ -6778,7 +6778,7 @@ TileData_16c63: ; 0x16c63
TileData_16c7d: ; 0x16c7d
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $65
@@ -6804,7 +6804,7 @@ TileData_16c7d: ; 0x16c7d
TileData_16c97: ; 0x16c97
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $65
@@ -6830,7 +6830,7 @@ TileData_16c97: ; 0x16c97
TileData_16cb1: ; 0x16cb1
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $5E
@@ -6856,7 +6856,7 @@ TileData_16cb1: ; 0x16cb1
TileData_16ccb: ; 0x16ccb
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $6C
@@ -6882,7 +6882,7 @@ TileData_16ccb: ; 0x16ccb
TileData_16ce5: ; 0x16ce5
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $73
@@ -6908,7 +6908,7 @@ TileData_16ce5: ; 0x16ce5
TileData_16cff: ; 0x16cff
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $73
@@ -6934,7 +6934,7 @@ TileData_16cff: ; 0x16cff
TileData_16d19: ; 0x16d19
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $73
@@ -6960,7 +6960,7 @@ TileData_16d19: ; 0x16d19
TileData_16d33: ; 0x16d33
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $6C
@@ -6986,7 +6986,7 @@ TileData_16d33: ; 0x16d33
TileData_16d4d: ; 0x16d4d
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $6
db $48
@@ -7000,7 +7000,7 @@ TileData_16d4d: ; 0x16d4d
TileData_16d5a: ; 0x16d5a
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $6
db $4B
@@ -7014,7 +7014,7 @@ TileData_16d5a: ; 0x16d5a
TileData_16d67: ; 0x16d67
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $D
db $4E
@@ -7028,7 +7028,7 @@ TileData_16d67: ; 0x16d67
TileData_16d74: ; 0x16d74
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $D
db $51
@@ -7042,7 +7042,7 @@ TileData_16d74: ; 0x16d74
TileData_16d81: ; 0x16d81
dw LoadTileLists
db $04
-
+
db $02
dw vBGMap + $49
db $40, $41
@@ -7056,7 +7056,7 @@ TileData_16d81: ; 0x16d81
TileData_16d8f: ; 0x16d8f
dw LoadTileLists
db $04
-
+
db $02
dw vBGMap + $49
db $44, $45
diff --git a/gfx/unknown/d63d0.png b/gfx/stage/apostrophe_color.png
index cc2e370..cc2e370 100644
--- a/gfx/unknown/d63d0.png
+++ b/gfx/stage/apostrophe_color.png
Binary files differ
diff --git a/gfx/unknown/d61d0.png b/gfx/stage/apostrophe_mono.png
index 5fb300d..5fb300d 100644
--- a/gfx/unknown/d61d0.png
+++ b/gfx/stage/apostrophe_mono.png
Binary files differ
diff --git a/gfx/unknown/d63e0.png b/gfx/stage/colon_color.png
index ef72665..ef72665 100644
--- a/gfx/unknown/d63e0.png
+++ b/gfx/stage/colon_color.png
Binary files differ
diff --git a/gfx/unknown/d61e0.png b/gfx/stage/colon_mono.png
index bebd547..bebd547 100644
--- a/gfx/unknown/d61e0.png
+++ b/gfx/stage/colon_mono.png
Binary files differ
diff --git a/gfx/unknown/d63a0.png b/gfx/stage/exclamation_point_color.png
index fdb2920..fdb2920 100644
--- a/gfx/unknown/d63a0.png
+++ b/gfx/stage/exclamation_point_color.png
Binary files differ
diff --git a/gfx/unknown/d61a0.png b/gfx/stage/exclamation_point_mono.png
index 1ae5327..1ae5327 100644
--- a/gfx/unknown/d61a0.png
+++ b/gfx/stage/exclamation_point_mono.png
Binary files differ
diff --git a/gfx/unknown/d63b0.png b/gfx/stage/period_color.png
index 2b18d63..2b18d63 100644
--- a/gfx/unknown/d63b0.png
+++ b/gfx/stage/period_color.png
Binary files differ
diff --git a/gfx/unknown/d61b0.png b/gfx/stage/period_mono.png
index 4a07793..4a07793 100644
--- a/gfx/unknown/d61b0.png
+++ b/gfx/stage/period_mono.png
Binary files differ
diff --git a/home/text.asm b/home/text.asm
index 1901676..1afd7ee 100755
--- a/home/text.asm
+++ b/home/text.asm
@@ -48,20 +48,20 @@ Func_310a: ; 0x310a
jr nz, .asm_311d
ret
-Func_3125: ; 0x3125
+Func_3125: ; 0x3125 enables special loads
ld b, $1
jr asm_312b
-Func_3129: ; 0x3129
+Func_3129: ; 0x3129 disables special loads
ld b, $0
-asm_312b: ; 0x312b
+asm_312b: ; 0x312b loads e chars of text text into de
ld a, [wd805]
and a
- jp nz, Func_3268
+ jp nz, Func_3268 ;if ??? = 0, then continue, else jump
.next_char
ld a, [hli]
and a
- ret z
+ ret z ;if a = 0, jump
ld c, $81
cp " "
jr z, .space
@@ -98,65 +98,65 @@ asm_312b: ; 0x312b
jr .next_char
.space
- ld a, c
+ ld a, c ;$81 = space
jr .load_char
.comma
- inc c
+ inc c ;$82 = , , goes back a space?
dec e
jr .check_special_load
.male
xor a
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $83
jr .load_char
.female
ld a, $1
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $84
jr .load_char
.apostrophe
ld a, $2
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $85
jr .load_char
.e_acute
ld a, $3
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $83
jr .load_char
.asterisk
ld a, $4
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $87
jr .load_char
.exclamation
ld a, $5
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $85
jr .load_char
.little_x
ld a, $6
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $85
jr .load_char
.period
ld a, $7
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $86
jr .load_char
.colon
ld a, $8
- call Func_31e1
+ call LoadSpecialTextChar
ld a, $83
jr .load_char
@@ -167,19 +167,19 @@ asm_312b: ; 0x312b
.alphabet
add $bf
.load_char
- ld [de], a
+ ld [de], a ;load char into de
.check_special_load
bit 0, b
- jr nz, .no_special_load
- set 7, e
+ jr nz, .no_special_load ;only load special if b is 1
+ set 7, e ;tempererally set 7 of e, adding to pointer de or taking it away
ld a, c
ld [de], a
res 7, e
.no_special_load
- inc e
+ inc e ;move to next slot
jp .next_char
-Func_31e1: ; 0x31e1
+LoadSpecialTextChar: ; 0x31e1 copy special font data into VRAM based on the contents of a
push bc
push de
push hl
@@ -196,7 +196,7 @@ Func_31e1: ; 0x31e1
add c
ld c, a
ld b, $0
- ld hl, Data_320e
+ ld hl, SpecialTextCharPointers ;special text pointers
add hl, bc
ld a, [hli]
ld e, a
@@ -207,51 +207,67 @@ Func_31e1: ; 0x31e1
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, b
+ ld a, b ;bytes taken are, in order, in e,d,a,l,h
ld bc, $0010
- call LoadVRAMData
+ call LoadVRAMData ;copy 16 byte image into VRAM
pop hl
pop de
pop bc
ret
-Data_320e:
- dw vTilesSH tile 3
- dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $40
- dw vTilesSH tile 4
+SpecialTextCharPointers:
+ dw vTilesSH tile 3 ;start of special font data for LoadSpecialTextChar if DMG
+ dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $40 ;bank of data, then pointer to source. each block is 5 bytes - male
+ dw vTilesSH tile 4 ; female
dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $30
- dw vTilesSH tile 5
- dbw Bank(GFX_d61d0), GFX_d61d0
- dw vTilesSH tile 3
+
+ dw vTilesSH tile 5 ;apostrophe
+ dbw Bank(Apostrophe_CharacterGfx), Apostrophe_CharacterGfx
+
+ dw vTilesSH tile 3 ;acute e
dbw Bank(E_Acute_CharacterGfx), E_Acute_CharacterGfx
- dw vTilesSH tile 7
+
+ dw vTilesSH tile 7 ;asterisk
dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $80
- dw vTilesSH tile 5
- dbw Bank(GFX_d61a0), GFX_d61a0
- dw vTilesSH tile 5
+
+ dw vTilesSH tile 5 ;exclaiamation point
+ dbw Bank(Exclamation_Point_CharacterGfx), Exclamation_Point_CharacterGfx
+
+ dw vTilesSH tile 5 ;little x
dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $10
- dw vTilesSH tile 6
- dbw Bank(GFX_d61b0), GFX_d61b0
- dw vTilesSH tile 3
- dbw Bank(GFX_d61e0), GFX_d61e0
- dw vTilesSH tile 3
- dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $40
- dw vTilesSH tile 4
+
+ dw vTilesSH tile 6 ;period
+ dbw Bank(Period_CharacterGfx), Period_CharacterGfx
+
+ dw vTilesSH tile 3 ;colon
+ dbw Bank(Colon_CharacterGfx), Colon_CharacterGfx
+
+ dw vTilesSH tile 3 ;start of special font data for LoadSpecialTextChar if DMG
+ dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $40 ;male
+
+ dw vTilesSH tile 4 ;female
dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $30
- dw vTilesSH tile 5
- dbw Bank(GFX_d63d0), GFX_d63d0
- dw vTilesSH tile 3
+
+ dw vTilesSH tile 5 ;apostrophe
+ dbw Bank(Apostrophe_CharacterGfx_GameboyColor), Apostrophe_CharacterGfx_GameboyColor
+
+ dw vTilesSH tile 3 ;acute e
dbw Bank(E_Acute_CharacterGfx_GameboyColor), E_Acute_CharacterGfx_GameboyColor
- dw vTilesSH tile 7
+
+ dw vTilesSH tile 7 ;asterisk
dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $80
- dw vTilesSH tile 5
- dbw Bank(GFX_d63a0), GFX_d63a0
- dw vTilesSH tile 5
+
+ dw vTilesSH tile 5 ;exclaimation point
+ dbw Bank(Exclamation_Point_CharacterGfx_GameboyColor), Exclamation_Point_CharacterGfx_GameboyColor
+
+ dw vTilesSH tile 5 ;little x
dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $10
- dw vTilesSH tile 6
- dbw Bank(GFX_d63b0), GFX_d63b0
- dw vTilesSH tile 3
- dbw Bank(GFX_d63e0), GFX_d63e0
+
+ dw vTilesSH tile 6 ;period
+ dbw Bank(Period_CharacterGfx_GameboyColor), Period_CharacterGfx_GameboyColor
+
+ dw vTilesSH tile 3 ;colon
+ dbw Bank(Colon_CharacterGfx_GameboyColor), Colon_CharacterGfx_GameboyColor
Func_3268: ; 0x3268
ld a, [hli]
diff --git a/main.asm b/main.asm
index 125344d..a966b6d 100755
--- a/main.asm
+++ b/main.asm
@@ -319,12 +319,12 @@ Func_10b3f: ; 0x10b3f
Func_10b59: ; 0x10b59
xor a
- ld [wd4aa], a
+ ld [wd4aa], a ;load 0 into ???
ld hl, wBottomMessageText
ld a, $81
ld b, $30
.asm_10b64
- ld [hli], a
+ ld [hli], a ;load spaces into bottom text? repeat 192 times
ld [hli], a
ld [hli], a
ld [hli], a
@@ -344,7 +344,7 @@ Func_10b59: ; 0x10b59
call LoadVRAMData
ret
-Func_10b8e: ; 0x10b8e
+Func_10b8e: ; 0x10b8e hl = start of party mons
ld a, [wNumPartyMons]
ld c, $0
ld b, a
@@ -360,17 +360,17 @@ Func_10b8e: ; 0x10b8e
.asm_10ba1
ret
-Func_10ba2: ; 0x10ba2
+Func_10ba2: ; 0x10ba2 a = current party mon, b is number to go before end of list, c is number passed so far
push bc
push hl
- swap c
+ swap c ;c* 32, does wird things if c starts >15
sla c
ld b, $0
ld hl, wBottomMessageText
- add hl, bc
+ add hl, bc ;goes down text as many times as new c
ld d, h
ld e, l
- ld c, a
+ ld c, a ;c now equals paerty mon, HL stored in de
ld b, $0
sla c
rl b
@@ -379,8 +379,8 @@ Func_10ba2: ; 0x10ba2
sla c
rl b
sla c
- rl b
- ld hl, PokemonNames
+ rl b ;multiplies party mon by 16, then jumps to correct name in the table
+ ld hl, PokemonNames ;names are 16 chars long
add hl, bc
ld a, $81
ld [de], a
@@ -393,8 +393,8 @@ Func_10ba2: ; 0x10ba2
inc de
ld a, $81
ld [de], a
- inc de
- call Func_3125
+ inc de ;load 4 spaces into de
+ call Func_3125 ;load 1 into b and...
.asm_10bda
ld a, e
and $1f
@@ -519,7 +519,7 @@ Func_10c38: ; 0x10c38
call LoadVRAMData
ret
-Func_10ca5: ; 0x10ca5
+PlaceEvolutionInParty: ; 0x10ca5
ld a, [wCurSelectedPartyMon]
ld c, a
ld b, $0
@@ -2218,7 +2218,7 @@ Data_3809a:
Data_380a6:
db $59, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-
+
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
@@ -2397,7 +2397,7 @@ INCLUDE "data/mon_gfx/mon_billboard_pics_1.asm"
StageRedFieldTopStatusBarSymbolsGfx_GameBoy: ; 0x63000
INCBIN "gfx/stage/red_top/status_bar_symbols_gameboy.2bpp"
-
+
INCBIN "gfx/unused_pocket_monster.2bpp"
SECTION "bank18.2", ROMX
@@ -2418,7 +2418,7 @@ INCLUDE "data/mon_gfx/mon_billboard_pics_3.asm"
StageBlueFieldTopStatusBarSymbolsGfx_GameBoy: ; 0x6b000
INCBIN "gfx/stage/blue_top/status_bar_symbols_gameboy.2bpp"
-
+
INCBIN "gfx/unused_pocket_monster.2bpp"
ds $20 ; free space
@@ -2636,7 +2636,7 @@ PikachuSaverGfx: ; 0xa8720
BallCaptureSmokeGfx:
INCBIN "gfx/stage/ball_capture_smoke.interleave.2bpp"
-
+
SECTION "bank2a.2", ROMX
PinballGreatballGfx: ; 0xa8a00
@@ -2679,7 +2679,7 @@ PokedexInitialGfx:
StageBlueFieldBottomCollisionMasks: ; 0xaf000
INCBIN "data/collision/masks/blue_stage_bottom.masks"
-
+
SECTION "bank2b.2", ROMX
DiglettBonusDugtrio3Gfx: ; 0xaf900
@@ -2847,7 +2847,7 @@ StageRedFieldBottomTilemap2_GameBoyColor: ; 0xbec00
StageBlueFieldTopTilemap_GameBoy: ; 0xbf000
INCBIN "gfx/tilemaps/stage_blue_field_top_gameboy.map"
-
+
SECTION "bank2f.3", ROMX
EraseAllDataTilemap: ; 0xbf800
@@ -2859,7 +2859,7 @@ SECTION "bank30", ROMX
StageBlueFieldBottomTilemap_GameBoy: ; 0xc0000
INCBIN "gfx/tilemaps/stage_blue_field_bottom_gameboy.map"
-
+
SECTION "bank30.2", ROMX
StageBlueFieldTopCollisionMasks: ; 0xc0800
@@ -2884,7 +2884,7 @@ StageBlueFieldTopCollisionAttributes: ; 0xc2800
OptionMenuTilemap2: ; 0xc3000
INCBIN "gfx/tilemaps/option_menu_2.map"
-
+
SECTION "bank30.3", ROMX
OptionMenuTilemap4: ; 0xc3400
@@ -3073,22 +3073,22 @@ SeelBonusTilemap2_GameBoyColor: ; 0xd5c00
Alphabet1Gfx: ; 0xd6000
INCBIN "gfx/stage/alphabet_1.2bpp"
-GFX_d61a0: INCBIN "gfx/unknown/d61a0.2bpp"
-GFX_d61b0: INCBIN "gfx/unknown/d61b0.2bpp"
+Exclamation_Point_CharacterGfx: INCBIN "gfx/stage/exclamation_point_mono.2bpp" ;DMG excalamation point
+Period_CharacterGfx: INCBIN "gfx/stage/period_mono.2bpp" ;DMG period
E_Acute_CharacterGfx: INCBIN "gfx/stage/e_acute_mono.2bpp"
-GFX_d61d0: INCBIN "gfx/unknown/d61d0.2bpp"
-GFX_d61e0: INCBIN "gfx/unknown/d61e0.2bpp"
-
+Apostrophe_CharacterGfx: INCBIN "gfx/stage/apostrophe_mono.2bpp" ;DMG apostrophe
+Colon_CharacterGfx: INCBIN "gfx/stage/colon_mono.2bpp" ;DMG colon
+
SECTION "bank35.5", ROMX
Alphabet2Gfx: ; 0xd6200
INCBIN "gfx/stage/alphabet_2.2bpp"
-GFX_d63a0: INCBIN "gfx/unknown/d63a0.2bpp"
-GFX_d63b0: INCBIN "gfx/unknown/d63b0.2bpp"
+Exclamation_Point_CharacterGfx_GameboyColor: INCBIN "gfx/stage/exclamation_point_color.2bpp";gbc excalamation point
+Period_CharacterGfx_GameboyColor: INCBIN "gfx/stage/period_color.2bpp" ;gbc period
E_Acute_CharacterGfx_GameboyColor: INCBIN "gfx/stage/e_acute_color.2bpp"
-GFX_d63d0: INCBIN "gfx/unknown/d63d0.2bpp"
-GFX_d63e0: INCBIN "gfx/unknown/d63e0.2bpp"
+Apostrophe_CharacterGfx_GameboyColor: INCBIN "gfx/stage/apostrophe_color.2bpp" ;GBC apostrophe
+Colon_CharacterGfx_GameboyColor: INCBIN "gfx/stage/colon_color.2bpp" ;gbc colon
SECTION "bank35.6", ROMX
@@ -3159,7 +3159,7 @@ INCLUDE "data/mon_gfx/mon_billboard_palette_maps_4.asm"
StageSharedBonusSlotGlowGfx: ; 0xdac00
INCBIN "gfx/stage/shared/bonus_slot_glow.2bpp"
-
+
SECTION "bank36.4", ROMX
StageSharedBonusSlotGlow2Gfx: ; 0xdade0
@@ -3191,7 +3191,7 @@ INCLUDE "data/mon_gfx/mon_billboard_palettes_4.asm"
StageRedFieldTopGfx6: ; 0xdbb80
INCBIN "gfx/stage/red_top/red_top_6.2bpp"
-
+
SECTION "bank36.8", ROMX
StageMewtwoBonusCollisionMasks: ; 0xdbc80
@@ -3210,7 +3210,7 @@ SECTION "bank37", ROMX
StageSharedArrowsGfx: ; 0xdc000
INCBIN "gfx/stage/shared/arrows.2bpp"
-
+
SECTION "bank37.2", ROMX
INCLUDE "data/mon_gfx/mon_billboard_palettes_5.asm"
diff --git a/wram.asm b/wram.asm
index 56dd18e..0816cb6 100755
--- a/wram.asm
+++ b/wram.asm
@@ -40,7 +40,7 @@ wc4c0:: ; 0xc4c0
wc4cc:: ; 0xc4cc
ds $34
-wBottomMessageText:: ; 0xc500
+wBottomMessageText:: ; 0xc500 WARNING: text loading code may break if this is moved
ds $100
wBottomMessageBuffer:: ; 0xc600
@@ -212,7 +212,7 @@ wBallSaverTimerFramesBackup:: ; 0xd4a6
wBallSaverTimerSecondsBackup:: ; 0xd4a7
ds $1
-wd4a8:: ; 0xd4a8
+wNumTimesBallSavedTextWillDisplayBackup:: ; 0xd4a8
ds $1
wd4a9:: ; 0xd4a9
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:49:47 +0000