Skip to content

Commit 6ef374f

Browse files
committed
FINDING STUPID STAT BUGgit add -A
1 parent c9c89d7 commit 6ef374f

File tree

2,509 files changed

+101159
-28495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,509 files changed

+101159
-28495
lines changed

WTW.cheats

-6
This file was deleted.

charmap.asm

+51-24
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,42 @@
3636
charmap "<ROCKET>", $5e ; "ROCKET"
3737
charmap "<DEXEND>", $5f
3838

39+
; Actual characters (from gfx/font/font_extra.png)
40+
41+
charmap "<BOLD_A>", $60 ; unused
42+
charmap "<BOLD_B>", $61 ; unused
43+
charmap "<BOLD_C>", $62 ; unused
44+
charmap "<BOLD_D>", $63 ; unused
45+
charmap "<BOLD_E>", $64 ; unused
46+
charmap "<BOLD_F>", $65 ; unused
47+
charmap "<BOLD_G>", $66 ; unused
48+
charmap "<BOLD_H>", $67 ; unused
49+
charmap "<BOLD_I>", $68 ; unused
50+
charmap "<BOLD_V>", $69
51+
charmap "<BOLD_S>", $6a
52+
charmap "<BOLD_L>", $6b ; unused
53+
charmap "<BOLD_M>", $6c ; unused
54+
charmap "<COLON>", $6d ; colon with tinier dots than ":"
55+
charmap "ぃ", $6e ; hiragana small i, unused
56+
charmap "ぅ", $6f ; hiragana small u, unused
57+
charmap "<PO>", $70
58+
charmap "<KE>", $71
59+
charmap "“", $72 ; opening quote
60+
charmap "”", $73 ; closing quote
61+
charmap "·", $74 ; middle dot, unused
62+
charmap "…", $75 ; ellipsis
63+
charmap "ぁ", $76 ; hiragana small a, unused
64+
charmap "ぇ", $77 ; hiragana small e, unused
65+
charmap "ぉ", $78 ; hiragana small o, unused
66+
67+
charmap "┌", $79
68+
charmap "─", $7a
69+
charmap "┐", $7b
70+
charmap "│", $7c
71+
charmap "└", $7d
72+
charmap "┘", $7e
73+
charmap " ", $7f
74+
3975
; Actual characters (from gfx/font/font_battle_extra.png)
4076

4177
charmap "<LV>", $6e
@@ -48,7 +84,14 @@
4884

4985
; Actual characters (from other graphics files)
5086

51-
charmap " ", $7f ; gfx/frames/space.png
87+
; needed for _LoadFontsExtra1 (see engine/gfx/load_font.asm)
88+
charmap "■", $60 ; gfx/font/black.2bpp
89+
charmap "▲", $61 ; gfx/font/up_arrow.png
90+
charmap "☎", $62 ; gfx/font/phone_icon.2bpp
91+
92+
; needed for MagikarpHouseSign (see engine/events/magikarp.asm)
93+
charmap "′", $6e ; gfx/font/feet_inches.png
94+
charmap "″", $6f ; gfx/font/feet_inches.png
5295

5396
; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
5497
charmap "⁂", $3f ; gfx/stats/stats_tiles.png, tile 14
@@ -116,15 +159,12 @@
116159
charmap "y", $b8
117160
charmap "z", $b9
118161

119-
charmap "┌", $ba
120-
charmap "─", $bb
121-
charmap "┐", $bc
122-
charmap "│", $bd
123-
charmap "└", $be
124-
charmap "┘", $bf
125-
126-
charmap "′", $ce
127-
charmap "″", $cf
162+
charmap "Ä", $c0
163+
charmap "Ö", $c1
164+
charmap "Ü", $c2
165+
charmap "ä", $c3
166+
charmap "ö", $c4
167+
charmap "ü", $c5
128168

129169
charmap "'d", $d0
130170
charmap "'l", $d1
@@ -134,28 +174,15 @@
134174
charmap "'t", $d5
135175
charmap "'v", $d6
136176

137-
charmap "■", $d7
138-
charmap "▲", $d8
139-
charmap "☎", $d9
140-
charmap "<BOLD_V>", $da
141-
charmap "<BOLD_S>", $db
142-
charmap "<COLON>", $dc ; colon with tinier dots than ":"
143-
charmap "“", $dd ; opening quote
144-
charmap "”", $de ; closing quote
145-
146177
charmap "←", $df
147178
charmap "'", $e0
148179
charmap "<PK>", $e1
149180
charmap "<MN>", $e2
150181
charmap "-", $e3
151182

152-
charmap "<PO>", $e4
153-
charmap "<KE>", $e5
154-
155183
charmap "?", $e6
156184
charmap "!", $e7
157185
charmap ".", $e8
158-
charmap "<DOT>", $e8 ; decimal point; same as "."
159186
charmap "&", $e9
160187

161188
charmap "é", $ea
@@ -166,7 +193,7 @@
166193
charmap "♂", $ef
167194
charmap "¥", $f0
168195
charmap "×", $f1
169-
charmap "", $f2 ; ellipsis
196+
charmap "<DOT>", $f2 ; decimal point; same as "." in English
170197
charmap "/", $f3
171198
charmap ",", $f4
172199
charmap "♀", $f5

constants/battle_anim_constants.asm

+1-7
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
6262
const ANIM_OBJ_BIG_ROCK
6363
const ANIM_OBJ_SMALL_ROCK
6464
const ANIM_OBJ_STRENGTH
65-
const ANIM_OBJ_ROCK_TOMB
6665
const ANIM_OBJ_SEISMIC_TOSS
6766
const ANIM_OBJ_BUBBLE
6867
const ANIM_OBJ_SURF
@@ -124,14 +123,12 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
124123
const ANIM_OBJ_STRING_SHOT
125124
const ANIM_OBJ_HAZE
126125
const ANIM_OBJ_MIST
127-
const ANIM_OBJ_DEFOG
128126
const ANIM_OBJ_SMOG
129127
const ANIM_OBJ_POISON_GAS
130128
const ANIM_OBJ_HORN
131129
const ANIM_OBJ_NEEDLE
132130
const ANIM_OBJ_PETAL_DANCE
133131
const ANIM_OBJ_SLUDGE_BOMB
134-
const ANIM_OBJ_ROCK_BLAST
135132
const ANIM_OBJ_PAY_DAY
136133
const ANIM_OBJ_SONICBOOM_JP_UNUSED
137134
const ANIM_OBJ_MIMIC
@@ -140,7 +137,6 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
140137
const ANIM_OBJ_BONE_CLUB
141138
const ANIM_OBJ_BONE_RUSH
142139
const ANIM_OBJ_SWIFT
143-
const ANIM_OBJ_SILVER_WIND
144140
const ANIM_OBJ_KINESIS
145141
const ANIM_OBJ_FLASH
146142
const ANIM_OBJ_SHINY
@@ -162,7 +158,7 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
162158
const ANIM_OBJ_AGILITY
163159
const ANIM_OBJ_HEART
164160
const ANIM_OBJ_FLAME_WHEEL
165-
const ANIM_OBJ_SAND_TOMB
161+
const ANIM_OBJ_SACRED_FIRE
166162
const ANIM_OBJ_COTTON_SPORE
167163
const ANIM_OBJ_MILK_DRINK
168164
const ANIM_OBJ_ANGER
@@ -203,7 +199,6 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
203199
const ANIM_OBJ_PERISH_SONG
204200
const ANIM_OBJ_FORESIGHT
205201
const ANIM_OBJ_RAPID_SPIN
206-
const ANIM_OBJ_STONE_EDGE
207202
const ANIM_OBJ_SWAGGER
208203
const ANIM_OBJ_BELLY_DRUM_HAND
209204
const ANIM_OBJ_BELLY_DRUM_NOTE
@@ -223,7 +218,6 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
223218
const ANIM_OBJ_PLAYERHEAD_1ROW
224219
const ANIM_OBJ_ENEMYFEET_2ROW
225220
const ANIM_OBJ_PLAYERHEAD_2ROW
226-
const ANIM_OBJ_BULLET_SEED
227221
DEF NUM_ANIM_OBJS EQU const_value
228222

229223
; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)

constants/battle_constants.asm

-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ DEF NUM_MOVES EQU 4
1010
DEF BASE_STAT_LEVEL EQU 7
1111
DEF MAX_STAT_LEVEL EQU 13
1212

13-
MIN_NEUTRAL_DAMAGE EQU 2
14-
1513
; turns that sleep lasts
1614
DEF REST_SLEEP_TURNS EQU 2
1715
DEF TREEMON_SLEEP_TURNS EQU 7
@@ -227,11 +225,9 @@ DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP_MASK
227225
const WEATHER_RAIN
228226
const WEATHER_SUN
229227
const WEATHER_SANDSTORM
230-
const WEATHER_HAIL
231228
const WEATHER_RAIN_END
232229
const WEATHER_SUN_END
233230
const WEATHER_SANDSTORM_END
234-
const WEATHER_HAIL_END
235231

236232
; wBattleAction
237233
const_def

constants/engine_flags.asm

+26-4
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
const ENGINE_ALWAYS_ON_BIKE
3737
const ENGINE_DOWNHILL
3838
; wJohtoBadges
39-
const ENGINE_ANCHORBADGE
40-
const ENGINE_CRUSHBADGE
39+
const ENGINE_ZEPHYRBADGE
4140
const ENGINE_HIVEBADGE
41+
const ENGINE_PLAINBADGE
4242
const ENGINE_FOGBADGE
4343
const ENGINE_MINERALBADGE
4444
const ENGINE_STORMBADGE
@@ -64,10 +64,32 @@
6464
const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
6565
; wVisitedSpawns
6666
const ENGINE_FLYPOINT_PLAYERS_HOUSE
67+
const ENGINE_FLYPOINT_DEBUG
68+
const ENGINE_FLYPOINT_PALLET
69+
const ENGINE_FLYPOINT_VIRIDIAN
70+
const ENGINE_FLYPOINT_PEWTER
71+
const ENGINE_FLYPOINT_CERULEAN
72+
const ENGINE_FLYPOINT_ROCK_TUNNEL
73+
const ENGINE_FLYPOINT_VERMILION
74+
const ENGINE_FLYPOINT_LAVENDER
75+
const ENGINE_FLYPOINT_SAFFRON
76+
const ENGINE_FLYPOINT_CELADON
77+
const ENGINE_FLYPOINT_FUCHSIA
78+
const ENGINE_FLYPOINT_CINNABAR
6779
const ENGINE_FLYPOINT_INDIGO_PLATEAU
6880
const ENGINE_FLYPOINT_NEW_BARK
69-
const ENGINE_FLYPOINT_BATTLE_TOWER
70-
const ENGINE_FLYPOINT_HERALD_COVE
81+
const ENGINE_FLYPOINT_CHERRYGROVE
82+
const ENGINE_FLYPOINT_VIOLET
83+
const ENGINE_FLYPOINT_AZALEA
84+
const ENGINE_FLYPOINT_CIANWOOD
85+
const ENGINE_FLYPOINT_GOLDENROD
86+
const ENGINE_FLYPOINT_OLIVINE
87+
const ENGINE_FLYPOINT_ECRUTEAK
88+
const ENGINE_FLYPOINT_MAHOGANY
89+
const ENGINE_FLYPOINT_LAKE_OF_RAGE
90+
const ENGINE_FLYPOINT_BLACKTHORN
91+
const ENGINE_FLYPOINT_SILVER_CAVE
92+
const ENGINE_FLYPOINT_UNUSED
7193
; wLuckyNumberShowFlag
7294
const ENGINE_LUCKY_NUMBER_SHOW
7395
; wStatusFlags2

0 commit comments

Comments
 (0)